texinfo-commits
[Top][All Lists]
Advanced

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

[no subject]


From: Patrice Dumas
Date: Tue, 24 Dec 2024 10:15:59 -0500 (EST)

branch: master
commit d93407ca3eb9afb20a015a0ebbfe75920ecddd33
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Nov 14 10:26:00 2024 +0100

    root line commands in 'argument' container in contents
    
    * tp/Texinfo/Common.pm (is_content_empty), tp/Texinfo/XS/main/utils.c
    (is_content_empty): ignore argument type.
    
    * tp/Texinfo/XS/convert/format_html.c (html_open_quotation_command):
    remove incorrect const.
    
    * tp/Texinfo/Common.pm (get_label_element), tp/Texinfo/XS/main/utils.c
    (get_label_element), tp/Texinfo/ParserNonXS.pm (_end_line_misc_line)
    (_check_valid_nesting, _handle_line_command)
    (_process_remaining_on_line, _parse_line_command_args),
    tp/Texinfo/Structuring.pm (check_nodes_are_referenced, nodes_tree)
    (new_node_menu_entry, new_block_command, new_complete_node_menu)
    (_print_down_menus), tp/Texinfo/Transformations.pm
    (fill_gaps_in_sectioning, _new_node)
    (_get_non_automatic_nodes_with_sections),
    tp/Texinfo/XS/parsetexi/end_line.c (parse_line_command_args)
    (end_line_misc_line), tp/Texinfo/XS/parsetexi/handle_commands.c
    (handle_line_command), tp/Texinfo/XS/parsetexi/parser.c
    (check_valid_nesting, process_remaining_on_line),
    tp/Texinfo/XS/structuring_transfo/structuring.c (new_block_command)
    (check_nodes_are_referenced, complete_node_tree_with_menus, nodes_tree)
    (new_node_menu_entry, new_complete_node_menu, print_down_menus),
    tp/Texinfo/XS/structuring_transfo/transformations.c
    (fill_gaps_in_sectioning, new_node)
    (insert_nodes_for_sectioning_commands)
    (get_non_automatic_nodes_with_sections): put arguments of root line
    commands (@node, sectioning commands) in the first content in the
    argument container type, remove args.
    
    * tp/Texinfo/Convert/Converter.pm
    (normalized_sectioning_command_filename, set_output_units_files)
    (format_comment_or_return_end_line, sort_element_counts),
    tp/Texinfo/Convert/DocBook.pm (conversion_output_begin)
    (_convert_argument_and_end_line, _convert), tp/Texinfo/Convert/HTML.pm
    (_internal_command_tree, _convert_heading_command)
    (_file_header_information, _prepare_converted_output_info)
    (_node_redirections), tp/Texinfo/Convert/LaTeX.pm (_convert),
    tp/Texinfo/Convert/NodeNameNormalization.pm (_convert),
    tp/Texinfo/Convert/Plaintext.pm (process_footnotes, format_contents)
    (_convert), tp/Texinfo/Convert/Texinfo.pm
    (root_heading_command_to_texinfo), tp/Texinfo/Convert/TexinfoMarkup.pm
    (_convert), tp/Texinfo/Convert/Text.pm (_convert),
    tp/Texinfo/XS/convert/convert_html.c (fulltitle_cmds)
    (html_prepare_converted_output_info, html_node_redirections),
    tp/Texinfo/XS/convert/converter.c
    (normalized_sectioning_command_filename),
    tp/Texinfo/XS/convert/format_html.c (html_internal_command_tree)
    (file_header_information, html_convert_heading_command),
    tp/Texinfo/XS/main/convert_to_texinfo.c
    (root_heading_command_to_texinfo),
    tp/Texinfo/XS/main/convert_to_text.c (convert_to_text_internal),
    tp/Texinfo/XS/main/node_name_normalization.c
    (convert_to_normalized_internal), tp/ext/epub3.pm (epub_finish),
    tp/init/chm.pm (chm_init): update conversion code for change in root
    commands tree.
---
 ChangeLog                                          |   60 +
 tp/TODO                                            |   11 +-
 tp/Texinfo/Common.pm                               |   11 +-
 tp/Texinfo/Convert/Converter.pm                    |   19 +-
 tp/Texinfo/Convert/DocBook.pm                      |   26 +-
 tp/Texinfo/Convert/HTML.pm                         |   82 +-
 tp/Texinfo/Convert/LaTeX.pm                        |   18 +-
 tp/Texinfo/Convert/NodeNameNormalization.pm        |    6 +-
 tp/Texinfo/Convert/Plaintext.pm                    |   27 +-
 tp/Texinfo/Convert/Texinfo.pm                      |    6 +-
 tp/Texinfo/Convert/TexinfoMarkup.pm                |   41 +-
 tp/Texinfo/Convert/Text.pm                         |   22 +-
 tp/Texinfo/ParserNonXS.pm                          |   88 +-
 tp/Texinfo/Structuring.pm                          |   35 +-
 tp/Texinfo/Transformations.pm                      |   23 +-
 tp/Texinfo/XS/convert/convert_html.c               |   19 +-
 tp/Texinfo/XS/convert/converter.c                  |   13 +-
 tp/Texinfo/XS/convert/format_html.c                |  105 +-
 tp/Texinfo/XS/main/convert_to_texinfo.c            |    6 +-
 tp/Texinfo/XS/main/convert_to_text.c               |   41 +-
 tp/Texinfo/XS/main/node_name_normalization.c       |    6 +-
 tp/Texinfo/XS/main/utils.c                         |   11 +-
 tp/Texinfo/XS/parsetexi/end_line.c                 |   58 +-
 tp/Texinfo/XS/parsetexi/handle_commands.c          |   11 +
 tp/Texinfo/XS/parsetexi/parser.c                   |   25 +-
 tp/Texinfo/XS/structuring_transfo/structuring.c    |   40 +-
 .../XS/structuring_transfo/transformations.c       |   17 +-
 tp/ext/epub3.pm                                    |    3 +-
 tp/init/chm.pm                                     |    3 +-
 tp/t/results/alias/alias_of_added_index.pl         |  110 +-
 .../alias_of_added_index_before_added_index.pl     |  110 +-
 tp/t/results/conditionals/cond.pl                  |   83 +-
 tp/t/results/conditionals/cond_ifhtml_ifinfo.pl    |   83 +-
 .../conditionals/cond_ifhtml_ifinfo_iftex.pl       |   83 +-
 tp/t/results/conditionals/cond_info.pl             |   83 +-
 .../conditionals/cond_info_ifhtml_ifinfo_iftex.pl  |   83 +-
 .../cond_info_no-ifhtml_no-ifinfo_no-iftex.pl      |   83 +-
 .../cond_no-ifhtml_no-ifinfo_no-iftex.pl           |   83 +-
 tp/t/results/conditionals/cond_xml.pl              |   83 +-
 tp/t/results/conditionals/defcondx_Dbar.pl         |   29 +-
 tp/t/results/conditionals/defcondx_Ubar.pl         |   29 +-
 .../results/converters_tests/at_commands_in_raw.pl |  114 +-
 tp/t/results/converters_tests/combined_fonts.pl    |  108 +-
 tp/t/results/converters_tests/commands_in_sc.pl    |  116 +-
 .../commands_in_settitle_with_title.pl             |  108 +-
 tp/t/results/converters_tests/commands_in_var.pl   |  116 +-
 tp/t/results/converters_tests/complex_nestings.pl  |  120 +-
 .../converters_tests/contents_at_document_begin.pl |  110 +-
 .../contents_at_document_begin_inline.pl           |  110 +-
 .../contents_at_document_begin_separate_element.pl |  110 +-
 .../conversion_with_undef_customization.pl         |  198 +-
 .../converters_tests/definition_commands.pl        |  264 +-
 tp/t/results/converters_tests/extension_undef.pl   |   79 +-
 .../results/converters_tests/footnote_no_number.pl |  108 +-
 .../footnote_no_number_separate.pl                 |  108 +-
 tp/t/results/converters_tests/form_feeds.pl        |   72 +-
 .../converters_tests/frenchspacing_and_code.pl     |  170 +-
 tp/t/results/converters_tests/image_formatting.pl  |  108 +-
 .../index_entry_in_preformatted.pl                 |  114 +-
 .../indices_in_begin_tables_lists.pl               |  248 +-
 ...ces_in_begin_tables_lists_entries_after_item.pl |  248 +-
 tp/t/results/converters_tests/link.pl              |   95 +-
 tp/t/results/converters_tests/non_empty_part.pl    |  431 +-
 .../non_empty_part_no_top_node_output.pl           |  431 +-
 .../printindex_merged_indices_code_style.pl        |  118 +-
 tp/t/results/converters_tests/ref_in_sectioning.pl | 1827 ++--
 .../reference_for_formatting_customizations.pl     |  108 +-
 .../references_to_top_no_top_output.pl             |  136 +-
 tp/t/results/converters_tests/refs_formatting.pl   |  146 +-
 .../converters_tests/sections_and_printindex.pl    |  195 +-
 .../converters_tests/setfilename_no_extension.pl   |   83 +-
 .../converters_tests/simplest_test_prefix.pl       |   29 +-
 .../some_at_commands_in_ref_nodes.pl               |  680 +-
 .../converters_tests/spaces_in_empty_node_names.pl |  162 +-
 .../converters_tests/spaces_in_node_names.pl       |  192 +-
 .../converters_tests/test_deftypefnnewline.pl      |  136 +-
 .../test_formatting_customizations.pl              |  108 +-
 .../converters_tests/things_before_setfilename.pl  |  112 +-
 tp/t/results/converters_tests/top_in_ref.pl        |  150 +-
 .../various_itemize_command_as_argument.pl         |  122 +-
 .../various_vtable_command_as_argument.pl          |  206 +-
 .../coverage/punctuation_in_line_commands.pl       |   70 +-
 .../coverage_braces/contain_plain_text_nestings.pl |  120 +-
 tp/t/results/coverage_braces/footnote_no_node.pl   |   29 +-
 .../coverage_braces/inforef_too_much_args.pl       |   31 +-
 tp/t/results/coverage_braces/seeentry_no_braces.pl |  110 +-
 tp/t/results/coverage_braces/test_image.pl         |   58 +-
 .../coverage_braces/two_footnotes_in_nodes.pl      |  110 +-
 .../two_footnotes_in_nodes_separate.pl             |  110 +-
 .../two_footnotes_in_nodes_separate_no_header.pl   |  110 +-
 .../def/all_commands_delimiters_printindex.pl      |  148 +-
 tp/t/results/def/all_commands_printindex.pl        |  108 +-
 tp/t/results/def/omit_def_space.pl                 |   62 +-
 tp/t/results/def/ref_in_def.pl                     |   57 +-
 tp/t/results/def/space_in_def_for_index.pl         |   58 +-
 tp/t/results/def/text_block_before_defline.pl      |  110 +-
 .../docbook_tests/between_node_and_section.pl      |  162 +-
 .../docbook_tests/multiple_documentlanguage.pl     |  270 +-
 .../docbook_tests/special_docbook_unnumbered.pl    |  278 +-
 tp/t/results/epub_tests/chapter_before_top_epub.pl |  137 +-
 tp/t/results/epub_tests/section_part_epub.pl       |   79 +-
 .../setfilename_on_top_and_after_node_epub.pl      |   84 +-
 tp/t/results/float/anchor_in_caption.pl            |   58 +-
 tp/t/results/float/cindex_in_caption.pl            |   60 +-
 .../results/float/comment_space_comand_in_float.pl |   54 +-
 tp/t/results/float/complex_float.pl                |  152 +-
 tp/t/results/float/float_copying.pl                |  110 +-
 tp/t/results/float/footnote_in_caption.pl          |   58 +-
 .../results/float/footnote_in_caption_and_error.pl |   58 +-
 .../float/numbering_captions_listoffloats.pl       |  688 +-
 .../float/special_characters_in_float_type.pl      |  114 +-
 tp/t/results/formats_encodings/accent.pl           |   54 +-
 .../formats_encodings/accent_argument_non_ascii.pl |  108 +-
 .../formats_encodings/accent_enable_encoding.pl    |   54 +-
 tp/t/results/formats_encodings/accentenc.pl        |   54 +-
 .../formats_encodings/accentenc_enable_encoding.pl |   54 +-
 .../formats_encodings/at_commands_in_refs.pl       | 8802 ++++++++++----------
 .../at_commands_in_refs_latin1.pl                  | 8802 ++++++++++----------
 .../formats_encodings/at_commands_in_refs_utf8.pl  | 8802 ++++++++++----------
 .../char_latin1_latin1_in_refs.pl                  |  346 +-
 .../char_latin2_latin2_in_refs.pl                  |  114 +-
 .../char_us_ascii_latin1_in_refs.pl                |  346 +-
 .../formats_encodings/char_utf8_latin1_in_refs.pl  |  346 +-
 .../dotless_argument_non_ascii.pl                  |  108 +-
 .../formats_encodings/japanese_shift_jis.pl        |  166 +-
 .../manual_simple_latin1_with_error.pl             |  137 +-
 .../manual_simple_utf8_with_error.pl               |  137 +-
 .../multiple_include_encodings.pl                  |  438 +-
 tp/t/results/formats_encodings/sample_utf8.pl      |  230 +-
 .../formats_encodings/verb_delimiter_not_ascii.pl  |  108 +-
 tp/t/results/formats_encodings/weird_accents.pl    |  108 +-
 .../weird_accents_disable_encoding.pl              |  108 +-
 tp/t/results/heading/heading_in_copying.pl         |   54 +-
 tp/t/results/html_tests/U_in_index.pl              |  114 +-
 .../html_tests/acronym_in_node_and_section.pl      |  248 +-
 tp/t/results/html_tests/anchor_on_vtable_item.pl   |  172 +-
 tp/t/results/html_tests/automatic_menus.pl         |  216 +-
 .../html_tests/base_for_css_info_in_init_test.pl   |   54 +-
 .../character_number_leading_toc_stoc.pl           |  104 +-
 tp/t/results/html_tests/check_htmlxref.pl          |  439 +-
 .../html_tests/check_htmlxref_ignore_ref_top_up.pl |  439 +-
 tp/t/results/html_tests/check_htmlxref_menu.pl     |  439 +-
 .../html_tests/check_htmlxref_no_use_nodes.pl      |  439 +-
 .../html_tests/command_in_node_redirection.pl      |   70 +-
 .../command_in_node_redirection_multiple.pl        |   70 +-
 .../command_in_node_redirection_other_command.pl   |   70 +-
 .../command_in_node_redirection_same_command.pl    |   70 +-
 .../command_in_node_redirection_two_commands.pl    |   70 +-
 tp/t/results/html_tests/contents_at_end.pl         |  110 +-
 tp/t/results/html_tests/contents_at_end_inline.pl  |  110 +-
 .../html_tests/contents_at_end_separate_element.pl |  110 +-
 .../html_tests/contents_in_middle_chapter.pl       |  166 +-
 .../contents_in_middle_chapter_inline.pl           |  166 +-
 .../contents_in_middle_chapter_separate_element.pl |  166 +-
 .../html_tests/contents_in_middle_section.pl       |  222 +-
 .../contents_in_middle_section_inline.pl           |  222 +-
 .../contents_in_middle_section_separate_element.pl |  222 +-
 .../html_tests/contents_with_only_top_node.pl      |   29 +-
 .../html_tests/css_in_node_redirection_page.pl     |   54 +-
 .../deftypefnnewline_for_copying_after.pl          |  110 +-
 .../deftypefnnewline_for_copying_before.pl         |  110 +-
 tp/t/results/html_tests/documentdescription.pl     |   25 +-
 tp/t/results/html_tests/double_contents.pl         |  166 +-
 .../html_tests/double_contents_after_title.pl      |  166 +-
 .../double_contents_after_title_show_title.pl      |  166 +-
 ...double_contents_after_title_show_title_nodes.pl |  166 +-
 tp/t/results/html_tests/double_contents_book.pl    |  166 +-
 tp/t/results/html_tests/double_contents_chapter.pl |  166 +-
 tp/t/results/html_tests/double_contents_inline.pl  |  166 +-
 .../html_tests/double_contents_inline_chapter.pl   |  166 +-
 .../html_tests/double_contents_inline_nodes.pl     |  166 +-
 .../html_tests/double_contents_inline_section.pl   |  166 +-
 tp/t/results/html_tests/double_contents_nodes.pl   |  166 +-
 tp/t/results/html_tests/double_contents_section.pl |  166 +-
 .../html_tests/double_contents_separate_element.pl |  166 +-
 .../double_contents_separate_element_chapter.pl    |  166 +-
 .../double_contents_separate_element_nodes.pl      |  166 +-
 .../double_contents_separate_element_section.pl    |  166 +-
 ...sive_self_section_reference_node_no_use_node.pl |  160 +-
 .../html_tests/empty_chapter_in_html_title.pl      |   98 +-
 ...y_chapter_in_html_title_no_node_no_use_nodes.pl |   73 +-
 .../empty_lines_at_beginning_no_setfilename.pl     |   54 +-
 .../empty_node_in_html_title_no_sec_name.pl        |   98 +-
 .../file_name_case_insensitive_conflict_node.pl    |  274 +-
 ...se_insensitive_conflict_node_no_redirections.pl |  274 +-
 ..._name_case_insensitive_conflict_redirections.pl |   89 +-
 .../html_tests/file_name_conflict_with_Top.pl      |  108 +-
 .../html_tests/file_name_conflict_with_section.pl  |   79 +-
 .../file_name_conflict_with_user_defined.pl        |  158 +-
 .../html_tests/filenameconflictwithnonsplit.pl     |   54 +-
 .../filenameconflictwithspecialelement.pl          |  108 +-
 tp/t/results/html_tests/float_copying.pl           |  122 +-
 ...otnotestyle_separate_html_text_no_monolithic.pl |  108 +-
 .../html_tests/footnotestyle_separate_late.pl      |  162 +-
 .../html_tests/headings_after_lone_nodes.pl        |  346 +-
 tp/t/results/html_tests/html_in_copying.pl         |   54 +-
 .../results/html_tests/index_and_node_same_name.pl |   56 +-
 tp/t/results/html_tests/index_below.pl             |   87 +-
 tp/t/results/html_tests/info_js_dir_html.pl        |  104 +-
 tp/t/results/html_tests/info_js_dir_html_file.pl   |  104 +-
 ...nfo_js_dir_html_file_js_weblabels_file_undef.pl |  104 +-
 tp/t/results/html_tests/info_js_dir_html_text.pl   |  104 +-
 tp/t/results/html_tests/inline_in_node.pl          |  258 +-
 tp/t/results/html_tests/letter_command_in_index.pl |  114 +-
 tp/t/results/html_tests/menu.pl                    |   76 +-
 .../html_tests/menu_in_documentdescription.pl      |   58 +-
 tp/t/results/html_tests/menu_in_example.pl         |   39 +-
 tp/t/results/html_tests/no_content.pl              |  110 +-
 tp/t/results/html_tests/no_content_do_contents.pl  |  110 +-
 .../html_tests/no_content_do_contents_inline.pl    |  110 +-
 .../no_content_do_contents_separate_element.pl     |  110 +-
 tp/t/results/html_tests/no_content_inline.pl       |  110 +-
 .../html_tests/no_content_separate_element.pl      |  110 +-
 tp/t/results/html_tests/node_footnote_end.pl       |  216 +-
 tp/t/results/html_tests/node_footnote_separated.pl |  216 +-
 tp/t/results/html_tests/node_footnote_use_node.pl  |  216 +-
 .../html_tests/node_footnote_use_node_separate.pl  |  216 +-
 .../html_tests/nodedescription_description.pl      |  224 +-
 .../nodedescription_description_no_use_nodes.pl    |  224 +-
 tp/t/results/html_tests/redirection_same_labels.pl |  295 +-
 tp/t/results/html_tests/ref_in_preformatted.pl     |   60 +-
 .../html_tests/sectioning_check_menu_structure.pl  | 1030 +--
 .../html_tests/set_unit_file_name_filepath.pl      |  104 +-
 tp/t/results/html_tests/shortcontents_no_top.pl    |   87 +-
 tp/t/results/html_tests/shorttitlepage.pl          |  110 +-
 .../html_tests/simple_only_special_spaces_node.pl  |  196 +-
 .../html_tests/simplest_test_date_in_header.pl     |   29 +-
 tp/t/results/html_tests/split_html_text.pl         |  104 +-
 tp/t/results/html_tests/test_accents_sc_default.pl |  108 +-
 .../html_tests/test_accents_sc_default_latin1.pl   |  108 +-
 .../html_tests/test_accents_sc_default_usascii.pl  |  108 +-
 .../html_tests/test_accents_sc_enable_encoding.pl  |  108 +-
 .../test_accents_sc_enable_encoding_latin1.pl      |  108 +-
 ...st_accents_sc_enable_encoding_to_utf8_latin1.pl |  108 +-
 ...t_accents_sc_enable_encoding_to_utf8_usascii.pl |  108 +-
 .../test_accents_sc_enable_encoding_usascii.pl     |  108 +-
 .../html_tests/test_accents_sc_to_utf8_latin1.pl   |  108 +-
 .../test_accents_sc_use_numeric_entity.pl          |  108 +-
 .../test_separated_contents_shortcontents.pl       |  162 +-
 .../html_tests/test_xrefautomaticsectiontitle.pl   |  114 +-
 .../test_xrefautomaticsectiontitle_off_first.pl    |  114 +-
 .../text_before_top_and_contents_after_title.pl    |   83 +-
 ...t_before_top_and_summarycontents_after_title.pl |   83 +-
 tp/t/results/html_tests/text_css_info_in_init.pl   |   54 +-
 tp/t/results/html_tests/titles.pl                  |  110 +-
 .../top_file_name_and_node_name_collision.pl       |  137 +-
 tp/t/results/html_tests/top_node_top_contents.pl   |   50 +-
 tp/t/results/html_tests/top_node_up_explicit.pl    |  250 +-
 .../html_tests/top_node_up_explicit_no_nodes.pl    |  250 +-
 tp/t/results/html_tests/top_node_up_implicit.pl    |  110 +-
 .../html_tests/top_node_up_implicit_no_nodes.pl    |  110 +-
 .../html_tests/transliterated_names_conflicts.pl   |  164 +-
 .../results/html_tests/undef_split_and_big_rule.pl |  133 +-
 .../xhtml_rule_element_already_closed.pl           |  104 +-
 tp/t/results/htmlxref/htmlxref.pl                  |  605 +-
 .../htmlxref/htmlxref_no_urlprefix_first.pl        |  108 +-
 tp/t/results/htmlxref/htmlxref_nodes.pl            |  605 +-
 tp/t/results/htmlxref/htmlxref_only_mono.pl        |  605 +-
 tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl  |  605 +-
 tp/t/results/htmlxref/htmlxref_only_split.pl       |  605 +-
 tp/t/results/htmlxref/htmlxref_only_split_nodes.pl |  605 +-
 tp/t/results/include/cpp_line_latin1.pl            |   77 +-
 tp/t/results/include/cpp_lines.pl                  |   54 +-
 .../macro_and_commands_in_early_commands.pl        |   83 +-
 tp/t/results/include/macro_in_early_commands.pl    |   83 +-
 tp/t/results/include/value_expansion_in_include.pl |   54 +-
 tp/t/results/indices/complex_recursive_synindex.pl |   58 +-
 tp/t/results/indices/def_syn_indices.pl            |  120 +-
 ...default_cp_index_and_one_letter_syncodeindex.pl |  Bin 10087 -> 10349 bytes
 tp/t/results/indices/double_index_entry.pl         |  108 +-
 tp/t/results/indices/double_seeentry_seealso.pl    |  124 +-
 tp/t/results/indices/double_syncodeindex.pl        |   56 +-
 tp/t/results/indices/empty_added_index_entry.pl    |   54 +-
 tp/t/results/indices/empty_cindex_entry.pl         |   54 +-
 tp/t/results/indices/empty_index_entry.pl          |   58 +-
 tp/t/results/indices/empty_string_index_entry.pl   |   64 +-
 tp/t/results/indices/encoding_index_ascii.pl       |   81 +-
 .../encoding_index_ascii_enable_encoding.pl        |   81 +-
 tp/t/results/indices/encoding_index_latin1.pl      |   85 +-
 .../encoding_index_latin1_enable_encoding.pl       |   85 +-
 tp/t/results/indices/encoding_index_utf8.pl        |   85 +-
 .../indices/encoding_index_utf8_enable_encoding.pl |   85 +-
 .../indices/encoding_index_utf8_no_use_unicode.pl  |   85 +-
 tp/t/results/indices/explicit_sort_key.pl          |   79 +-
 tp/t/results/indices/ftable_vtable.pl              |   72 +-
 .../indices/ignored_sort_char_empty_entries.pl     |   79 +-
 tp/t/results/indices/image_lines_count.pl          |  Bin 5652 -> 5768 bytes
 tp/t/results/indices/image_text_lines_count.pl     |  Bin 6055 -> 6171 bytes
 tp/t/results/indices/index_and_node_same_name.pl   |  110 +-
 tp/t/results/indices/index_entries_before_nodes.pl |  Bin 11507 -> 11739 bytes
 tp/t/results/indices/index_entries_locations.pl    |   62 +-
 .../indices/index_entry_before_first_node.pl       |  Bin 6138 -> 6254 bytes
 tp/t/results/indices/index_entry_before_node.pl    |  221 +-
 tp/t/results/indices/index_entry_in_footnote.pl    |  Bin 7028 -> 7144 bytes
 .../index_entry_in_footnote_different_node_end.pl  |   95 +-
 .../indices/index_entry_in_footnote_sections.pl    |  110 +-
 .../index_entry_in_footnote_sections_separate.pl   |  110 +-
 .../indices/index_entry_in_footnote_separate.pl    |   95 +-
 tp/t/results/indices/index_no_node.pl              |  145 +-
 tp/t/results/indices/index_no_node_no_top.pl       |  145 +-
 .../indices/index_no_node_no_top_no_node.pl        |  145 +-
 tp/t/results/indices/index_nodes.pl                |  455 +-
 .../indices/index_nodes_no_split_no_use_nodes.pl   |  455 +-
 tp/t/results/indices/index_special_region.pl       |  167 +-
 .../index_special_region_no_insertcopying.pl       |  167 +-
 ...egion_no_insertcopying_no_titlepage_no_nodes.pl |  167 +-
 ...l_region_no_insertcopying_titlepage_no_nodes.pl |  167 +-
 ...copying_titlepage_no_nodes_footnotes_default.pl |  167 +-
 .../index_special_region_no_titlepage_no_nodes.pl  |  167 +-
 .../index_special_region_titlepage_no_nodes.pl     |  167 +-
 ..._region_titlepage_no_nodes_footnotes_default.pl |  167 +-
 tp/t/results/indices/index_split.pl                |  731 +-
 .../indices/index_split_split_chapter_no_nodes.pl  |  731 +-
 tp/t/results/indices/index_table.pl                |  316 +-
 .../results/indices/index_table_chapter_no_node.pl |  316 +-
 .../multiple_index_text_sortas_seeentry_seealso.pl |  110 +-
 tp/t/results/indices/nodes_before_top.pl           |  703 +-
 .../nodes_before_top_and_sections_chapter.pl       |  953 ++-
 ...odes_before_top_and_sections_chapter_no_node.pl |  953 ++-
 ...des_before_top_and_sections_unsplit_no_nodes.pl |  953 ++-
 .../indices/nodes_before_top_split_chapter.pl      |  703 +-
 .../nodes_before_top_split_chapter_no_nodes.pl     |  703 +-
 tp/t/results/indices/print_merged_index.pl         |   54 +-
 .../indices/printindex_between_node_section.pl     |  166 +-
 .../indices/printindex_between_part_chapter.pl     |  195 +-
 .../indices/printindex_index_entry_in_copying.pl   |  110 +-
 ...rintindex_index_entry_in_copying_in_footnote.pl |  110 +-
 ...ndex_index_entry_in_copying_no_insertcopying.pl |  110 +-
 .../indices/printindex_with_space_before.pl        |  Bin 6953 -> 7215 bytes
 .../indices/same_index_entry_merged_indices.pl     |  106 +-
 tp/t/results/indices/same_only_seealso_seeentry.pl |  122 +-
 tp/t/results/indices/same_seealso_seeentry.pl      |  124 +-
 tp/t/results/indices/seealso_duplicate.pl          |   76 +-
 tp/t/results/indices/seeentry.pl                   |  114 +-
 tp/t/results/indices/sorted_subentries.pl          |  282 +-
 tp/t/results/indices/split_chapter_index.pl        |  242 +-
 tp/t/results/indices/subentries.pl                 |  162 +-
 tp/t/results/indices/subentries_and_comments.pl    |  114 +-
 tp/t/results/indices/subentry_and_sortas.pl        |  114 +-
 tp/t/results/indices/subentry_and_sortas_spaces.pl |  134 +-
 tp/t/results/indices/syncode_index_print_both.pl   |  110 +-
 tp/t/results/indices/syncodeindex_to_plain.pl      |   56 +-
 tp/t/results/indices/transparent_sort_chars.pl     |   79 +-
 tp/t/results/indices/w_lines_count.pl              |  Bin 9378 -> 9620 bytes
 tp/t/results/info_tests/anchor_and_spaces.pl       |   54 +-
 tp/t/results/info_tests/anchor_in_command.pl       |   29 +-
 tp/t/results/info_tests/before_node_and_section.pl |  124 +-
 .../info_tests/chinese_mixed_with_en_EUC_CN.pl     |  108 +-
 tp/t/results/info_tests/colon_in_index_entry.pl    |   39 +-
 .../info_tests/colons_in_index_entries_and_node.pl |  151 +-
 .../colons_in_index_entries_and_node_no_quoting.pl |  151 +-
 tp/t/results/info_tests/def_in_copying.pl          |   58 +-
 tp/t/results/info_tests/direntry_dircategory.pl    |  112 +-
 .../direntry_dircategory_and_commands.pl           |   54 +-
 tp/t/results/info_tests/empty_caption.pl           |   33 +-
 tp/t/results/info_tests/encoding_us_ascii.pl       |   29 +-
 .../end_of_line_command_in_node_lines.pl           |  236 +-
 tp/t/results/info_tests/error_in_footnote.pl       |   33 +-
 tp/t/results/info_tests/file_only_png.pl           |  Bin 3520 -> 3636 bytes
 tp/t/results/info_tests/float_long_captions.pl     |   37 +-
 tp/t/results/info_tests/float_without_type.pl      |   29 +-
 tp/t/results/info_tests/image_and_punctuation.pl   |  Bin 7107 -> 7223 bytes
 .../info_tests/image_and_spaces_formatting.pl      |   29 +-
 tp/t/results/info_tests/image_extension.pl         |  Bin 4477 -> 4593 bytes
 tp/t/results/info_tests/image_in_paragraph.pl      |  Bin 2999 -> 3115 bytes
 tp/t/results/info_tests/image_not_found.pl         |   29 +-
 tp/t/results/info_tests/image_quotes.pl            |  Bin 2590 -> 2706 bytes
 .../info_tests/image_text_file_only_and_alt.pl     |  Bin 2714 -> 2830 bytes
 tp/t/results/info_tests/index_entry_at_end_node.pl |  168 +-
 .../info_tests/invalid_node_name_no_warning.pl     |  178 +-
 .../info_tests/invalid_node_name_warning.pl        |  178 +-
 tp/t/results/info_tests/known_encoding.pl          |   29 +-
 .../multitable_anchor_and_index_entry.pl           |   39 +-
 .../info_tests/nested_footnotes_separate.pl        |   29 +-
 .../info_tests/nested_multitable_anchor_index.pl   |   37 +-
 tp/t/results/info_tests/no_node_but_top.pl         |   25 +-
 tp/t/results/info_tests/no_top_node.pl             |   25 +-
 tp/t/results/info_tests/note_in_strong.pl          |   29 +-
 .../info_tests/note_in_strong_end_of_line.pl       |   29 +-
 tp/t/results/info_tests/novalidate_empty_refs.pl   |  106 +-
 .../info_tests/one_node_counted_elements.pl        |   79 +-
 .../info_tests/paragraphindent_and_preamble.pl     |   66 +-
 .../paragraphindent_in_preamble_and_in_document.pl |   66 +-
 .../info_tests/paragraphindent_not_in_preamble.pl  |   66 +-
 tp/t/results/info_tests/pxref_test.pl              |   45 +-
 tp/t/results/info_tests/quote_node_names_info.pl   |  631 +-
 tp/t/results/info_tests/recursive_down_menu.pl     |  110 +-
 tp/t/results/info_tests/ref_tests.pl               |   57 +-
 .../similar_external_and_internal_node.pl          |  101 +-
 tp/t/results/info_tests/space_at_menu_end.pl       |   31 +-
 tp/t/results/info_tests/space_in_menu.pl           |  110 +-
 tp/t/results/info_tests/space_in_setfilename.pl    |   25 +-
 tp/t/results/info_tests/split_no_copying.pl        |  110 +-
 tp/t/results/info_tests/split_nocopying.pl         |  122 +-
 tp/t/results/info_tests/split_nocopying_split.pl   |  122 +-
 .../info_tests/split_test_before_first_node.pl     |  110 +-
 .../split_test_before_first_node_no_empty_line.pl  |  110 +-
 tp/t/results/info_tests/test_index.pl              |  347 +-
 tp/t/results/info_tests/text_before_node.pl        |   94 +-
 tp/t/results/info_tests/top_node_normalization.pl  |   35 +-
 .../info_tests/two_paragraphindent_in_preamble.pl  |   66 +-
 ..._paragraphindent_in_preamble_and_in_document.pl |   66 +-
 tp/t/results/info_tests/unknown_encoding.pl        |   29 +-
 tp/t/results/info_tests/xref_test.pl               |   49 +-
 .../access_document_name_in_handler.pl             |  104 +-
 ...tton_replacement_and_direction_customization.pl |  104 +-
 ..._replacement_direction_strings_customization.pl |  104 +-
 ...utton_replacement_for_special_unit_direction.pl |  104 +-
 .../init_files_tests/customize_special_element.pl  |  162 +-
 .../init_files_tests/customize_translations.pl     |  324 +-
 .../init_files_tests/directions_string_base.pl     |  320 +-
 .../init_files_tests/directions_string_undef.pl    |  320 +-
 .../directions_string_undef_texi2html.pl           |  320 +-
 .../init_files_tests/documentation_examples.pl     |  220 +-
 .../documentation_examples_texi2html.pl            |  220 +-
 .../redefined_buttons_functions.pl                 |  320 +-
 .../ref_for_special_unit_direction.pl              |  104 +-
 .../special_unit_direction_customization.pl        |  104 +-
 ...est_format_single_footnote_in_inline_content.pl |  112 +-
 .../translation_in_parser_in_translation.pl        |  110 +-
 .../init_files_tests/undefined_node_filename.pl    |   54 +-
 .../init_files_tests/unknown_custom_variable.pl    |  104 +-
 tp/t/results/invalid_nestings/footnote_in_ref.pl   |   29 +-
 tp/t/results/invalid_nestings/ignore_in_xref.pl    |   31 +-
 tp/t/results/invalid_nestings/ignored_text.pl      |   69 +-
 tp/t/results/invalid_nestings/in_table.pl          |   70 +-
 .../invalid_nestings/menu_in_style_command.pl      |   31 +-
 tp/t/results/invalid_nestings/node_in_copying.pl   |   29 +-
 .../invalid_nestings/node_in_copying_not_closed.pl |   54 +-
 .../invalid_nestings/node_on_index_entry_line.pl   |  229 +-
 tp/t/results/invalid_nestings/on_node_line.pl      |  339 +-
 tp/t/results/invalid_nestings/on_section_line.pl   |  159 +-
 tp/t/results/invalid_nestings/quotation_in_ref.pl  |   29 +-
 tp/t/results/invalid_nestings/ref_in_ref.pl        |   33 +-
 .../invalid_nestings/ref_to_top_in_anchor.pl       |   31 +-
 .../results/invalid_nestings/section_in_copying.pl |   25 +-
 .../invalid_nestings/section_in_flushright.pl      |   25 +-
 .../invalid_nestings/section_in_footnote.pl        |   25 +-
 tp/t/results/invalid_nestings/section_in_math.pl   |   54 +-
 .../section_in_nested_block_commands.pl            |   25 +-
 tp/t/results/invalid_nestings/section_in_table.pl  |   29 +-
 .../invalid_nestings/section_on_cartouche_line.pl  |   54 +-
 .../invalid_nestings/section_on_def_line.pl        |   29 +-
 .../invalid_nestings/section_on_defx_line.pl       |   29 +-
 .../invalid_nestings/section_on_enumerate_line.pl  |   54 +-
 .../invalid_nestings/section_on_float_line.pl      |   25 +-
 .../section_on_index_entry_line.pl                 |   29 +-
 .../invalid_nestings/section_on_itemize_line.pl    |  114 +-
 .../invalid_nestings/section_on_multitable_line.pl |   83 +-
 .../invalid_nestings/section_on_xtable_line.pl     |  118 +-
 .../style_not_closed_before_first_node.pl          |   29 +-
 .../style_not_closed_no_newline_root_commands.pl   |  110 +-
 .../style_not_closed_root_commands.pl              |  110 +-
 .../unclosed_verb_on_section_line.pl               |   53 +-
 tp/t/results/invalid_nestings/verbatim_in_ref.pl   |   29 +-
 .../itemize/inter_item_commands_in_enumerate.pl    |  122 +-
 .../itemize/inter_item_commands_in_itemize.pl      |  122 +-
 tp/t/results/languages/appendix_translated.pl      |   83 +-
 tp/t/results/languages/command_translated.pl       |  132 +-
 tp/t/results/languages/documentlanguage.pl         |  112 +-
 .../documentlanguage_generated_master_menu.pl      |  270 +-
 tp/t/results/languages/documentlanguage_option.pl  |  112 +-
 tp/t/results/languages/documentlanguage_unknown.pl |  112 +-
 .../results/languages/multiple_documentlanguage.pl |  112 +-
 tp/t/results/languages/multiple_in_preamble.pl     |  112 +-
 .../languages/multiple_in_preamble_before_node.pl  |  110 +-
 tp/t/results/languages/multiple_lang_chapters.pl   |  346 +-
 .../languages/multiple_lang_chapters_latex.pl      |  346 +-
 .../languages/multiple_lang_chapters_texi2html.pl  |  346 +-
 tp/t/results/languages/simple_documentlanguage.pl  |   56 +-
 tp/t/results/languages/unknown_language.pl         |  112 +-
 tp/t/results/languages/unknown_region.pl           |   56 +-
 tp/t/results/latex_tests/anchor_before_top.pl      |  110 +-
 tp/t/results/latex_tests/anchor_in_copying.pl      |  110 +-
 .../anchor_in_copying_insertcopying_chap.pl        |  112 +-
 .../anchor_in_copying_insertcopying_titlepage.pl   |  112 +-
 ...chor_in_copying_insertcopying_titlepage_chap.pl |  112 +-
 .../anchor_links_xref_xrefautomaticsectiontitle.pl |  182 +-
 .../latex_tests/custom_heading_with_include.pl     |  676 +-
 .../custom_heading_with_include_in_command.pl      |  676 +-
 tp/t/results/latex_tests/custom_headings.pl        |  195 +-
 .../latex_tests/custom_headings_and_comments.pl    |  166 +-
 .../latex_tests/customize_informative_commands.pl  |   25 +-
 .../latex_tests/error_in_sectioning_command.pl     |  224 +-
 tp/t/results/latex_tests/float_and_refs.pl         |  226 +-
 tp/t/results/latex_tests/fonttextsize.pl           |  253 +-
 tp/t/results/latex_tests/indices.pl                |  124 +-
 .../latex_tests/indices_disable_encoding.pl        |  124 +-
 .../informative_commands_in_top_node.pl            |  108 +-
 tp/t/results/latex_tests/node_before_top.pl        |  139 +-
 tp/t/results/latex_tests/pagesizes.pl              |  137 +-
 tp/t/results/latex_tests/pagetype.pl               |  137 +-
 tp/t/results/latex_tests/settitle_and_headings.pl  |   29 +-
 tp/t/results/latex_tests/shorttitlepage.pl         |  108 +-
 tp/t/results/latex_tests/titlepage_classical.pl    |  108 +-
 tp/t/results/latex_tests/titlepage_in_top_node.pl  |  108 +-
 tp/t/results/latex_tests/titlepage_long_title.pl   |  108 +-
 tp/t/results/latex_tests/titlepage_no_author.pl    |  108 +-
 tp/t/results/latex_tests/titlepage_no_title.pl     |  108 +-
 .../titlepage_with_commands_classical.pl           |  108 +-
 .../latex_tests/top_no_sectioning_command.pl       |   85 +-
 tp/t/results/layout/navigation.pl                  |  222 +-
 tp/t/results/layout/navigation_chapter.pl          |  222 +-
 .../results/layout/navigation_chapter_no_header.pl |  222 +-
 .../navigation_chapter_no_header_vertical.pl       |  222 +-
 tp/t/results/layout/navigation_chapter_vertical.pl |  222 +-
 tp/t/results/layout/navigation_no_header.pl        |  222 +-
 .../layout/navigation_no_header_vertical.pl        |  222 +-
 tp/t/results/layout/navigation_node.pl             |  222 +-
 tp/t/results/layout/navigation_node_no_header.pl   |  222 +-
 .../layout/navigation_node_no_header_vertical.pl   |  222 +-
 tp/t/results/layout/navigation_node_vertical.pl    |  222 +-
 tp/t/results/layout/navigation_section.pl          |  222 +-
 .../results/layout/navigation_section_no_header.pl |  222 +-
 .../navigation_section_no_header_vertical.pl       |  222 +-
 tp/t/results/layout/navigation_section_vertical.pl |  222 +-
 .../layout/navigation_test_misc_file_collision.pl  |  222 +-
 .../layout/navigation_test_undef_top_buttons.pl    |  222 +-
 .../layout/navigation_test_zero_top_buttons.pl     |  222 +-
 tp/t/results/layout/navigation_vertical.pl         |  222 +-
 tp/t/results/layout/no_monolithic.pl               |  112 +-
 tp/t/results/layout/no_monolithic_only_toc_out.pl  |  112 +-
 .../linemacro/simple_nested_linemacro_calls.pl     |   31 +-
 tp/t/results/macro/backslash_in_arg.pl             |   56 +-
 tp/t/results/macro/bib_example.pl                  |  192 +-
 tp/t/results/macro/glossary.pl                     |  114 +-
 .../macro/macro_alias_definfoenclose_defindex.pl   |  114 +-
 tp/t/results/macro/macro_in_index_commands.pl      |   60 +-
 tp/t/results/macro/macro_in_misc_commands.pl       |  204 +-
 ...pendix_and_associated_part_in_generated_menu.pl |  324 +-
 .../menu/block_commands_in_menu_description.pl     |   60 +-
 .../menu/commands_in_nodedescriptionblock.pl       |  178 +-
 tp/t/results/menu/comment_on_menu_line.pl          |   81 +-
 tp/t/results/menu/detailmenu_on_subnodes.pl        |  336 +-
 tp/t/results/menu/detailmenu_unknown_node.pl       |   31 +-
 .../menu/direntry_dircategory_after_first_node.pl  |   56 +-
 tp/t/results/menu/empty_leading_menu_comment.pl    |   33 +-
 tp/t/results/menu/empty_menu_description.pl        |   35 +-
 tp/t/results/menu/empty_menu_entry_name.pl         |   58 +-
 tp/t/results/menu/entry_after_detailmenu.pl        |   87 +-
 tp/t/results/menu/example_in_menu_description.pl   |   56 +-
 tp/t/results/menu/format_menu_undef.pl             |  104 +-
 tp/t/results/menu/formats_in_menu.pl               |   39 +-
 tp/t/results/menu/inlineraw_in_menu_description.pl |   56 +-
 tp/t/results/menu/invalid_info_menu_entry.pl       |   49 +-
 .../results/menu/leading_space_before_menu_star.pl |   29 +-
 tp/t/results/menu/menu_in_deffn.pl                 |   33 +-
 tp/t/results/menu/menu_in_example.pl               |   39 +-
 tp/t/results/menu/menu_node_unterminated.pl        |   33 +-
 tp/t/results/menu/menu_pointing_to_anchor.pl       |   56 +-
 tp/t/results/menu/menu_title_before_entries.pl     |   56 +-
 .../results/menu/missing_detailmenu_on_subnodes.pl |  336 +-
 tp/t/results/menu/multiple_menus.pl                |   37 +-
 tp/t/results/menu/no_colon_in_menu.pl              |   29 +-
 tp/t/results/menu/nodedescription_descriptions.pl  |  460 +-
 .../menu/nodedescriptionblock_descriptions.pl      |  350 +-
 .../menu/part_appendix_in_generated_menu.pl        |  295 +-
 tp/t/results/menu/reference_to_external_manual.pl  |   31 +-
 tp/t/results/menu/sc_in_menu.pl                    |   74 +-
 .../menu/space_and_commands_in_menu_node.pl        |  162 +-
 tp/t/results/menu/submenu_in_example.pl            |   29 +-
 tp/t/results/menu/verb_in_menu_description.pl      |   56 +-
 .../codequoteundirected_codequotebacktick.pl       |  108 +-
 .../misc_commands/comment_space_command_on_line.pl |  180 +-
 .../no_empty_line_between_headings.pl              |   79 +-
 tp/t/results/misc_commands/nodedescription.pl      |  112 +-
 tp/t/results/misc_commands/ref_in_center.pl        |  110 +-
 tp/t/results/misc_commands/test_allowcodebreaks.pl |   54 +-
 .../misc_commands/text_before_line_command.pl      |   62 +-
 tp/t/results/moresectioning/anchor_in_footnote.pl  |  112 +-
 .../moresectioning/anchor_in_footnote_separate.pl  |  112 +-
 .../anchor_in_footnote_separate_split_node.pl      |  112 +-
 .../anchor_in_footnote_split_node.pl               |  112 +-
 tp/t/results/moresectioning/chapter_sections.pl    |  228 +-
 .../moresectioning/character_and_spaces_in_refs.pl |  659 +-
 .../character_and_spaces_in_refs_out.pl            |  659 +-
 tp/t/results/moresectioning/complex.pl             | 1198 +--
 .../moresectioning/complex_split_at_node.pl        | 1198 +--
 tp/t/results/moresectioning/contents.pl            |  319 +-
 .../moresectioning/contents_and_shortcontents.pl   |  319 +-
 .../contents_at_begin_chapter_without_node.pl      |   79 +-
 .../moresectioning/contents_at_end_document.pl     |   83 +-
 .../contents_at_end_document_after_node.pl         |  156 +-
 .../results/moresectioning/contents_in_document.pl |   79 +-
 tp/t/results/moresectioning/empty_top_node_up.pl   |   81 +-
 .../equivalent_nodes_defined_linked.pl             |  112 +-
 .../results/moresectioning/internal_top_node_up.pl |   81 +-
 .../moresectioning/lowered_subsubsection.pl        |  384 +-
 tp/t/results/moresectioning/loweredheading.pl      |   29 +-
 .../moresectioning/more_sections_than_nodes.pl     |  682 +-
 .../more_sections_than_nodes_texi2html.pl          |  682 +-
 .../moresectioning/nodes_before_after_top_xref.pl  |  174 +-
 ...nodes_no_section_footnote_no_top_node_output.pl |   54 +-
 .../non_automatic_internal_top_node_up.pl          |  465 +-
 .../non_automatic_top_node_up_and_url.pl           |  465 +-
 .../non_automatic_top_node_up_url.pl               |  305 +-
 .../moresectioning/only_special_spaces_node.pl     |  342 +-
 .../moresectioning/placed_things_before_element.pl |   33 +-
 .../placed_things_before_element_no_use_node.pl    |   33 +-
 .../moresectioning/placed_things_before_node.pl    |  112 +-
 tp/t/results/moresectioning/raiselowersections.pl  |  328 +-
 tp/t/results/moresectioning/rec_nodes.pl           |  349 +-
 .../moresectioning/section_in_unnumbered_info.pl   | 1786 ++--
 .../section_in_unnumbered_plaintext.pl             | 1786 ++--
 .../moresectioning/sectioning_part_appendix.pl     |  313 +-
 .../sectioning_part_appendix_no_top.pl             |  284 +-
 .../sectioning_part_appendix_texi2html_chapter.pl  |  315 +-
 tp/t/results/moresectioning/sections_test.pl       |  315 +-
 .../moresectioning/sections_test_no_use_nodes.pl   |  315 +-
 ...ctions_test_no_use_nodes_use_node_directions.pl |  315 +-
 tp/t/results/moresectioning/shortcontents.pl       |  319 +-
 .../moresectioning/special_spaces_in_nodes.pl      |  334 +-
 .../results/moresectioning/top_chapter_sections.pl |  257 +-
 tp/t/results/moresectioning/top_node_up_url.pl     |   81 +-
 tp/t/results/moresectioning/topic_guide.pl         |  567 +-
 tp/t/results/plaintext_tests/all_spaces.pl         |   50 +-
 .../cartouche_and_paragraph_indentation.pl         |  162 +-
 .../plaintext_tests/chinese_mixed_with_en.pl       |  108 +-
 tp/t/results/plaintext_tests/japanese_utf8.pl      |  166 +-
 .../plaintext_tests/line_passed_and_formats.pl     |   33 +-
 .../plaintext_tests/no_empty_line_after_section.pl |  116 +-
 tp/t/results/plaintext_tests/non_break_spaces.pl   |   29 +-
 .../punctuation_sc_accents_ascii_glyph.pl          |  108 +-
 .../punctuation_sc_accents_ascii_glyph_latin1.pl   |  108 +-
 .../punctuation_sc_accents_ascii_glyph_usascii.pl  |  108 +-
 .../punctuation_sc_accents_default.pl              |  108 +-
 .../punctuation_sc_accents_default_latin1.pl       |  108 +-
 .../punctuation_sc_accents_default_usascii.pl      |  108 +-
 .../punctuation_sc_accents_disable_encoding.pl     |  108 +-
 ...nctuation_sc_accents_disable_encoding_latin1.pl |  108 +-
 ...ctuation_sc_accents_disable_encoding_usascii.pl |  108 +-
 ...uation_sc_accents_to_utf8_ascii_glyph_latin1.pl |  108 +-
 ...ation_sc_accents_to_utf8_ascii_glyph_usascii.pl |  108 +-
 .../punctuation_sc_accents_to_utf8_latin1.pl       |  108 +-
 .../punctuation_sc_accents_to_utf8_usascii.pl      |  108 +-
 tp/t/results/plaintext_tests/quote_node_names.pl   |  631 +-
 .../plaintext_tests/settitle_and_empty_top.pl      |   23 +-
 tp/t/results/raw/inlineraw_not_closed.pl           |   25 +-
 tp/t/results/regions/anchor_in_copying.pl          |   60 +-
 .../regions/anchor_in_copying_in_footnote.pl       |   60 +-
 tp/t/results/regions/anchor_in_titlepage.pl        |  110 +-
 .../regions/anchor_in_titlepage_titlepage.pl       |  110 +-
 tp/t/results/regions/format_in_titlepage.pl        |   54 +-
 .../regions/format_in_titlepage_titlepage.pl       |   54 +-
 tp/t/results/regions/ref_in_copying.pl             |  110 +-
 .../regions/ref_in_copying_insert_in_chapter.pl    |  164 +-
 tp/t/results/regions/today_in_copying.pl           |   83 +-
 tp/t/results/sectioning/a_comma_after_node.pl      |  103 +-
 tp/t/results/sectioning/anchor_zero.pl             |   31 +-
 tp/t/results/sectioning/at_commands_in_node.pl     |  223 +-
 .../sectioning/automatic_menu_referencing_node.pl  |  158 +-
 .../sectioning/chapter_before_and_after_part.pl    |   87 +-
 tp/t/results/sectioning/chapter_before_part.pl     |   54 +-
 tp/t/results/sectioning/chapter_between_nodes.pl   |  181 +-
 .../sectioning/chapter_between_nodes_texi2html.pl  |  181 +-
 .../chapter_between_nodes_with_appendix.pl         |  131 +-
 .../chapter_between_nodes_with_appendix_nomenu.pl  |  131 +-
 .../chapter_node_before_and_after_part.pl          |  139 +-
 .../sectioning/character_and_spaces_in_node.pl     |  505 +-
 tp/t/results/sectioning/contents_and_parts.pl      |  280 +-
 tp/t/results/sectioning/contents_in_html_text.pl   |  116 +-
 .../sectioning/contents_with_only_top_node.pl      |   29 +-
 .../results/sectioning/double_node_anchor_float.pl |  112 +-
 tp/t/results/sectioning/double_part.pl             |  166 +-
 ...double_recursive_self_section_node_reference.pl |  195 +-
 ...sive_self_section_node_reference_no_use_node.pl |  195 +-
 .../double_recursive_self_section_reference.pl     |  160 +-
 tp/t/results/sectioning/double_top.pl              |  158 +-
 tp/t/results/sectioning/double_top_in_menu.pl      |  162 +-
 tp/t/results/sectioning/double_top_section.pl      |   58 +-
 tp/t/results/sectioning/email_in_node.pl           |  161 +-
 tp/t/results/sectioning/empty_node.pl              |  152 +-
 .../sectioning/empty_nodes_with_commands.pl        |  106 +-
 tp/t/results/sectioning/empty_ref_arg.pl           |   37 +-
 .../results/sectioning/empty_section_in_chapter.pl |   48 +-
 tp/t/results/sectioning/equivalent_labels.pl       |   33 +-
 tp/t/results/sectioning/equivalent_nodes.pl        |  120 +-
 .../sectioning/equivalent_nodes_novalidate.pl      |  120 +-
 .../results/sectioning/explicit_node_directions.pl |  247 +-
 tp/t/results/sectioning/external_node_in_menu.pl   |  166 +-
 tp/t/results/sectioning/hole_in_sectioning.pl      |  141 +-
 .../in_menu_only_special_ascii_spaces_node.pl      |  142 +-
 .../in_menu_only_special_ascii_spaces_node_menu.pl |  142 +-
 .../sectioning/in_menu_only_special_spaces_node.pl |  350 +-
 .../in_menu_only_special_spaces_node_menu.pl       |  350 +-
 tp/t/results/sectioning/lone_Top_node.pl           |   81 +-
 tp/t/results/sectioning/loop_nodes.pl              |  227 +-
 tp/t/results/sectioning/menutextorder.pl           |  382 +-
 tp/t/results/sectioning/next_in_menu_is_below.pl   |  220 +-
 tp/t/results/sectioning/next_no_prev_to_node.pl    |  215 +-
 .../results/sectioning/no_argument_and_contents.pl |   66 +-
 tp/t/results/sectioning/no_menu.pl                 |  206 +-
 tp/t/results/sectioning/node_empty_direction.pl    |   29 +-
 tp/t/results/sectioning/node_line_arguments.pl     |  673 +-
 tp/t/results/sectioning/node_nested_parentheses.pl |   45 +-
 .../sectioning/node_part_chapter_after_chapter.pl  |  199 +-
 .../sectioning/node_part_chapter_after_top.pl      |  129 +-
 tp/t/results/sectioning/node_referenced_in_ref.pl  |   87 +-
 .../node_sectop_before_chapter_no_node.pl          |   79 +-
 .../sectioning/node_sectop_before_lone_node_Top.pl |  137 +-
 tp/t/results/sectioning/node_simple.pl             |   13 +-
 tp/t/results/sectioning/node_too_much_args.pl      |   89 +-
 .../node_up_direction_for_top_with_manual.pl       |   87 +-
 tp/t/results/sectioning/node_up_external_node.pl   |  202 +-
 tp/t/results/sectioning/nodename_parentheses.pl    |  230 +-
 ...fter_top_before_chapter_no_use_nodes_chapter.pl |  272 +-
 .../nodes_after_top_before_chapter_nodes.pl        |  272 +-
 .../nodes_after_top_before_chapter_not_split.pl    |  272 +-
 ...ore_chapter_not_split_no_use_node_directions.pl |  272 +-
 .../nodes_after_top_before_chapter_sections.pl     |  272 +-
 .../nodes_after_top_before_chapter_texi2html.pl    |  272 +-
 ...p_before_chapter_texi2html_use_nodes_chapter.pl |  272 +-
 .../nodes_after_top_before_section_nodes.pl        |  272 +-
 .../nodes_after_top_before_section_sections.pl     |  272 +-
 ...s_after_top_before_section_texi2html_chapter.pl |  272 +-
 ...after_top_before_section_texi2html_use_nodes.pl |  272 +-
 ...p_before_section_texi2html_use_nodes_chapter.pl |  272 +-
 tp/t/results/sectioning/nodes_before_after_top.pl  |  166 +-
 tp/t/results/sectioning/nodes_before_top.pl        |  332 +-
 .../nodes_no_node_top_explicit_directions.pl       |  168 +-
 tp/t/results/sectioning/novalidate.pl              |   69 +-
 .../one_node_explicit_directions_anchor.pl         |   75 +-
 ..._node_explicit_directions_anchor_no_use_node.pl |   75 +-
 tp/t/results/sectioning/one_subsection.pl          |   25 +-
 tp/t/results/sectioning/one_subsection_and_node.pl |   50 +-
 tp/t/results/sectioning/part_before_chapter.pl     |   46 +-
 tp/t/results/sectioning/part_before_section.pl     |   48 +-
 tp/t/results/sectioning/part_before_top.pl         |   46 +-
 tp/t/results/sectioning/part_chapter_after_top.pl  |  129 +-
 tp/t/results/sectioning/part_chapter_appendix.pl   |   83 +-
 tp/t/results/sectioning/part_node_after_top.pl     |  106 +-
 tp/t/results/sectioning/part_node_before_top.pl    |  184 +-
 .../sectioning/part_node_chapter_after_top.pl      |  352 +-
 .../sectioning/part_node_chapter_appendix.pl       |  162 +-
 .../sectioning/part_node_chapter_node_appendix.pl  |  189 +-
 .../sectioning/part_node_node_part_appendix.pl     |  210 +-
 tp/t/results/sectioning/part_node_part_appendix.pl |  183 +-
 .../sectioning/part_node_part_node_appendix.pl     |  210 +-
 tp/t/results/sectioning/part_section_part.pl       |   83 +-
 .../sectioning/protected_node_parentheses.pl       |  107 +-
 .../sectioning/recursive_self_section_reference.pl |   84 +-
 tp/t/results/sectioning/ref_to_top.pl              |   56 +-
 .../reference_to_only_special_spaces_node.pl       |  190 +-
 .../sectioning/section_before_after_top_node.pl    |  112 +-
 .../section_before_after_top_node_last_node.pl     |  137 +-
 tp/t/results/sectioning/section_before_chapter.pl  |   54 +-
 tp/t/results/sectioning/section_before_part.pl     |   58 +-
 tp/t/results/sectioning/section_before_top.pl      |  152 +-
 .../sectioning/section_before_top_no_node.pl       |   54 +-
 .../results/sectioning/section_below_unnumbered.pl |  166 +-
 .../sectioning/section_below_unnumbered_no_top.pl  |   50 +-
 .../sectioning/section_chapter_before_top.pl       |   83 +-
 .../sectioning/section_chapter_before_top_nodes.pl |  166 +-
 .../results/sectioning/section_node_before_part.pl |   79 +-
 tp/t/results/sectioning/sections.pl                |   25 +-
 tp/t/results/sectioning/semi_auto.pl               |  298 +-
 .../setfilename_on_top_and_after_node.pl           |   84 +-
 tp/t/results/sectioning/space_in_node.pl           |  120 +-
 .../sectioning/split_for_format_not_split.pl       |   29 +-
 .../sectioning/top_no_argument_and_content.pl      |   23 +-
 .../results/sectioning/top_no_argument_and_node.pl |   44 +-
 .../sectioning/top_no_argument_and_top_node.pl     |   44 +-
 .../sectioning/top_node_no_menu_direction.pl       |  122 +-
 tp/t/results/sectioning/top_node_part_top.pl       |   75 +-
 tp/t/results/sectioning/top_part_chapter.pl        |   77 +-
 tp/t/results/sectioning/top_without_node_nodes.pl  |  127 +-
 .../sectioning/top_without_node_sections.pl        |  127 +-
 .../top_without_node_texi2html_no_use_nodes.pl     |  127 +-
 .../transliterated_split_equivalent_nodes.pl       |  173 +-
 tp/t/results/sectioning/two_nodes_at_the_end.pl    |  280 +-
 .../sectioning/two_nodes_at_the_end_nodes.pl       |  280 +-
 .../sectioning/two_nodes_at_the_end_texi2html.pl   |  280 +-
 .../sectioning/two_nodes_between_chapters.pl       |  305 +-
 .../sectioning/two_nodes_between_chapters_nodes.pl |  305 +-
 .../two_nodes_between_chapters_texi2html.pl        |  305 +-
 .../sectioning/two_unnumbered_no_argument.pl       |   38 +-
 .../unknown_node_direction_novalidate.pl           |   61 +-
 tp/t/results/sectioning/unknown_node_in_menu.pl    |   31 +-
 .../sectioning/unknown_node_in_menu_novalidate.pl  |   31 +-
 .../sectioning/unnumbered_before_node_top_top.pl   |   83 +-
 tp/t/results/sectioning/unnumbered_before_top.pl   |   54 +-
 .../sectioning/unnumbered_before_top_node.pl       |   58 +-
 tp/t/results/sectioning/unnumbered_no_argument.pl  |   19 +-
 .../unnumbered_top_without_node_nodes.pl           |  225 +-
 .../unnumbered_top_without_node_sections.pl        |  225 +-
 ...dex_entries_relate_to_item_no_transformation.pl |  116 +-
 .../index_entries_relate_to_item_transformation.pl |  116 +-
 .../insert_nodes_for_sectioning_commands.pl        |  653 +-
 tp/t/results/transformations/master_menu_fr.pl     |  187 +-
 ...generate_master_menu_no_need_for_master_menu.pl |  106 +-
 .../regenerate_master_menu_with_menu_comment.pl    |  185 +-
 tp/t/results/value/value_in_index_commands.pl      |   60 +-
 tp/t/results/value/value_in_misc_commands.pl       |  127 +-
 tp/t/results/value/value_in_node.pl                |  465 +-
 tp/t/results/value/value_node_directions.pl        |  658 +-
 tp/t/results/xml_tests/commands_and_spaces.pl      |  183 +-
 tp/t/results/xml_tests/image_inline_or_not.pl      |  150 +-
 .../xml_tests/sectioning_test_no_use_nodes.pl      |  216 +-
 tp/t/results/xml_tests/sectioning_test_ref.pl      |  216 +-
 tp/t/results/xml_tests/top_node_and_bye.pl         |   29 +-
 tp/t/results/xml_tests/top_node_no_section.pl      |   25 +-
 tp/t/results/xtable/block_commands_in_table.pl     |  120 +-
 .../results/xtable/inter_item_commands_in_table.pl |  174 +-
 tp/t/results/xtable/item_index_transformation.pl   |   80 +-
 804 files changed, 83890 insertions(+), 69174 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 95e6144f64..98db6341b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,63 @@
+2024-11-14  Patrice Dumas  <pertusus@free.fr>
+
+       root line commands in 'argument' container in contents
+
+       * tp/Texinfo/Common.pm (is_content_empty), tp/Texinfo/XS/main/utils.c
+       (is_content_empty): ignore argument type.
+
+       * tp/Texinfo/XS/convert/format_html.c (html_open_quotation_command):
+       remove incorrect const.
+
+       * tp/Texinfo/Common.pm (get_label_element), tp/Texinfo/XS/main/utils.c
+       (get_label_element), tp/Texinfo/ParserNonXS.pm (_end_line_misc_line)
+       (_check_valid_nesting, _handle_line_command)
+       (_process_remaining_on_line, _parse_line_command_args),
+       tp/Texinfo/Structuring.pm (check_nodes_are_referenced, nodes_tree)
+       (new_node_menu_entry, new_block_command, new_complete_node_menu)
+       (_print_down_menus), tp/Texinfo/Transformations.pm
+       (fill_gaps_in_sectioning, _new_node)
+       (_get_non_automatic_nodes_with_sections),
+       tp/Texinfo/XS/parsetexi/end_line.c (parse_line_command_args)
+       (end_line_misc_line), tp/Texinfo/XS/parsetexi/handle_commands.c
+       (handle_line_command), tp/Texinfo/XS/parsetexi/parser.c
+       (check_valid_nesting, process_remaining_on_line),
+       tp/Texinfo/XS/structuring_transfo/structuring.c (new_block_command)
+       (check_nodes_are_referenced, complete_node_tree_with_menus, nodes_tree)
+       (new_node_menu_entry, new_complete_node_menu, print_down_menus),
+       tp/Texinfo/XS/structuring_transfo/transformations.c
+       (fill_gaps_in_sectioning, new_node)
+       (insert_nodes_for_sectioning_commands)
+       (get_non_automatic_nodes_with_sections): put arguments of root line
+       commands (@node, sectioning commands) in the first content in the
+       argument container type, remove args.
+
+       * tp/Texinfo/Convert/Converter.pm
+       (normalized_sectioning_command_filename, set_output_units_files)
+       (format_comment_or_return_end_line, sort_element_counts),
+       tp/Texinfo/Convert/DocBook.pm (conversion_output_begin)
+       (_convert_argument_and_end_line, _convert), tp/Texinfo/Convert/HTML.pm
+       (_internal_command_tree, _convert_heading_command)
+       (_file_header_information, _prepare_converted_output_info)
+       (_node_redirections), tp/Texinfo/Convert/LaTeX.pm (_convert),
+       tp/Texinfo/Convert/NodeNameNormalization.pm (_convert),
+       tp/Texinfo/Convert/Plaintext.pm (process_footnotes, format_contents)
+       (_convert), tp/Texinfo/Convert/Texinfo.pm
+       (root_heading_command_to_texinfo), tp/Texinfo/Convert/TexinfoMarkup.pm
+       (_convert), tp/Texinfo/Convert/Text.pm (_convert),
+       tp/Texinfo/XS/convert/convert_html.c (fulltitle_cmds)
+       (html_prepare_converted_output_info, html_node_redirections),
+       tp/Texinfo/XS/convert/converter.c
+       (normalized_sectioning_command_filename),
+       tp/Texinfo/XS/convert/format_html.c (html_internal_command_tree)
+       (file_header_information, html_convert_heading_command),
+       tp/Texinfo/XS/main/convert_to_texinfo.c
+       (root_heading_command_to_texinfo),
+       tp/Texinfo/XS/main/convert_to_text.c (convert_to_text_internal),
+       tp/Texinfo/XS/main/node_name_normalization.c
+       (convert_to_normalized_internal), tp/ext/epub3.pm (epub_finish),
+       tp/init/chm.pm (chm_init): update conversion code for change in root
+       commands tree.
+
 2024-11-12  Patrice Dumas  <pertusus@free.fr>
 
        use contents for definition lines instead of args
diff --git a/tp/TODO b/tp/TODO
index a1ace1fa2a..b7554b5634 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -936,21 +936,24 @@ Decomposition of the time used for the Texinfo manual 
with full XS
 SUM: 98
 
 
-find tp/Texinfo  -type f -regex '\.pm' -list
-find tp/Texinfo  -type f -name '*.pm' -execdir perl -wpli -e 's/^#no 
autovivification qw\(fetch delete exists store strict\);/no autovivification 
qw\(fetch delete exists store strict\);/' '{}' ';'
-find tp/Texinfo  -type f -name '*.pm' -execdir perl -wpli -e 's/^no 
autovivification qw\(fetch delete exists store strict\);/#no autovivification 
qw\(fetch delete exists store strict\);/' '{}' ';'
+find tp/Texinfo tp/ext tp/init -type f -name '*.pm' -print
+find tp/Texinfo tp/ext tp/init -type f -name '*.pm' -execdir perl -wpli -e 
's/^#no autovivification qw\(fetch delete exists store strict\);/no 
autovivification qw\(fetch delete exists store strict\);/' '{}' ';'
+find tp/Texinfo tp/ext tp/init -type f -name '*.pm' -execdir perl -wpli -e 
's/^no autovivification qw\(fetch delete exists store strict\);/#no 
autovivification qw\(fetch delete exists store strict\);/' '{}' ';'
 
 
 patch -p1 < build_perl_info_fix_typo.diff
 patch -p1 < avoid_deprecated_dirs_autovivification.diff
 patch -p1 < test_sort_init_config_customization.diff
 patch -p1 < Parsetexi_check_conf_defined.diff
+patch -p1 < epub_image_empty_check.diff
+patch -p1 < html32_check_itemize_extra.diff
 
 patch -R -p1 < build_perl_info_fix_typo.diff
 patch -R -p1 < avoid_deprecated_dirs_autovivification.diff
 patch -R -p1 < test_sort_init_config_customization.diff
 patch -R -p1 < Parsetexi_check_conf_defined.diff
-
+patch -R -p1 < epub_image_empty_check.diff
+patch -R -p1 < html32_check_itemize_extra.diff
 
 Setting flags
 # some features are only enabled at -O2, but sometime -O0 is better
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index b3b42fc03a..1ce806e721 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -1395,6 +1395,8 @@ sub is_content_empty($;$)
         next;
       }
     }
+    next if ($content->{'type'}
+             and $content->{'type'} eq 'argument');
     if ($content->{'cmdname'}) {
       if ($content->{'type'} and $content->{'type'} eq 'index_entry_command') {
         if ($do_not_ignore_index_entries) {
@@ -1726,16 +1728,13 @@ sub get_label_element($)
 {
   my $current = shift;
   return undef if (!defined($current->{'cmdname'}));
-  if ($current->{'cmdname'} eq 'node'
-      and $current->{'args'} and scalar(@{$current->{'args'}})) {
-    return $current->{'args'}->[0];
+  if ($current->{'cmdname'} eq 'node') {
+    return $current->{'contents'}->[0]->{'contents'}->[0];
   } elsif ($current->{'cmdname'} eq 'anchor'
            and $current->{'contents'} and scalar(@{$current->{'contents'}})) {
     return $current->{'contents'}->[0];
   } elsif ($current->{'cmdname'} eq 'float'
-      and $current->{'contents'} and scalar(@{$current->{'contents'}})
-      and $current->{'contents'}->[0]->{'contents'}
-      and scalar(@{$current->{'contents'}->[0]->{'contents'}}) >= 2) {
+           and scalar(@{$current->{'contents'}->[0]->{'contents'}}) >= 2) {
     return $current->{'contents'}->[0]->{'contents'}->[1];
   }
   return undef;
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index 5113e06a76..9180007bfd 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -658,9 +658,15 @@ sub normalized_sectioning_command_filename($$)
   $no_unidecode = 1 if (defined($self->get_conf('USE_UNIDECODE'))
                         and !$self->get_conf('USE_UNIDECODE'));
 
+  my $label_element;
+  if ($Texinfo::Commands::root_commands{$command->{'cmdname'}}) {
+    $label_element = $command->{'contents'}->[0]->{'contents'}->[0];
+  } else {
+    $label_element = $command->{'args'}->[0];
+  }
   my $normalized_name
     = Texinfo::Convert::NodeNameNormalization::normalize_transliterate_texinfo(
-         {'contents' => $command->{'args'}->[0]->{'contents'}},
+         {'contents' => $label_element->{'contents'}},
                   $no_unidecode);
 
   my $filename = $self->_id_to_filename($normalized_name);
@@ -939,7 +945,7 @@ sub set_output_units_files($$$$$$)
               $node_filename
                = $self->node_information_filename(
                                $root_command->{'extra'}->{'normalized'},
-                               $root_command->{'args'}->[0]);
+                       $root_command->{'contents'}->[0]->{'contents'}->[0]);
             }
             $node_filename .= $extension;
             $self->set_file_path($node_filename,$destination_directory);
@@ -1338,7 +1344,8 @@ sub format_comment_or_return_end_line($$)
   if ($element->{'args'}) {
     $arguments_list = $element->{'args'};
   } elsif ($element->{'contents'} and scalar(@{$element->{'contents'}})
-           and $element->{'contents'}->[0]->{'contents'}) {
+           and $element->{'contents'}->[0]->{'type'}
+           and $element->{'contents'}->[0]->{'type'} eq 'argument') {
     $arguments_list = $element->{'contents'}->[0]->{'contents'};
   }
 
@@ -1712,12 +1719,12 @@ sub sort_element_counts($$;$$)
     my $name;
     if ($output_unit->{'unit_command'}) {
       my $command = $output_unit->{'unit_command'};
-      if ($command->{'args'}
-          and $command->{'args'}->[0]->{'contents'}) {
+      my $line_arg = $command->{'contents'}->[0]->{'contents'}->[0];
+      if ($line_arg->{'contents'}) {
         # convert contents to avoid outputting end of lines
         $name = "\@$command->{'cmdname'} "
           .Texinfo::Convert::Texinfo::convert_to_texinfo(
-               {'contents' => $command->{'args'}->[0]->{'contents'}});
+               {'contents' => $line_arg->{'contents'}});
       }
     }
     $name = 'UNNAMED output unit' if (!defined($name));
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index a9c7631a3c..2b39d35a95 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -499,9 +499,10 @@ sub conversion_output_begin($;$$)
     # if there is a legalnotice, we really want to have a title
     # preceding it, so we also use @top
     my $command = $global_commands->{'top'};
+    my $line_arg
+      = $global_commands->{'top'}->{'contents'}->[0]->{'contents'}->[0];
     $fulltitle_command = $command
-      unless (!$command->{'args'}
-              or !$command->{'args'}->[0]->{'contents'});
+      if ($line_arg->{'contents'});
   }
 
   my $title_info = '';
@@ -700,7 +701,13 @@ sub _convert_argument_and_end_line($$)
   my $self = shift;
   my $element = shift;
 
-  my $converted = $self->convert_tree($element->{'args'}->[-1]);
+  my $line_arg;
+  if ($element->{'args'}) {
+    $line_arg = $element->{'args'}->[-1];
+  } else {
+    $line_arg = $element->{'contents'}->[0]->{'contents'}->[-1];
+  }
+  my $converted = $self->convert_tree($line_arg);
   my $end_line = $self->format_comment_or_return_end_line($element);
   return ($converted, $end_line);
 }
@@ -1028,13 +1035,12 @@ sub _convert($$;$)
             }
             push @{$self->{'lang_stack'}}, $language;
             $result .= "<$docbook_sectioning_element${section_attribute}>\n";
-            if ($opened_element->{'args'}) {
-              my ($arg, $end_line)
-                = _convert_argument_and_end_line($self, $opened_element);
-              $result .= "<title>$arg</title>$end_line";
-              chomp ($result);
-              $result .= "\n";
-            }
+            my ($arg, $end_line)
+              = _convert_argument_and_end_line($self, $opened_element);
+            $result .= "<title>$arg</title>$end_line";
+            chomp ($result);
+            $result .= "\n";
+
             # if associated with a sectioning element, the part is opened
             # before the sectioning element, such that the part content
             # appears after the sectioning command opening, no need for
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index b2c39f7c9a..78ee71d1c8 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -1284,43 +1284,47 @@ sub _internal_command_tree($$$)
         if ($command->{'cmdname'} eq 'anchor') {
           $label_element = $command->{'contents'}->[0];
         } else {
-          $label_element = $command->{'args'}->[0];
+          $label_element = $command->{'contents'}->[0]->{'contents'}->[0];
         }
         $tree = {'type' => '_code',
                  'contents' => [$label_element]};
       } elsif ($command->{'cmdname'} and ($command->{'cmdname'} eq 'float')) {
         $tree = $self->float_type_number($command);
-      } elsif (!$command->{'args'}->[0]
-               or !$command->{'args'}->[0]->{'contents'}
-               or !scalar(@{$command->{'args'}->[0]->{'contents'}})) {
       } else {
-        my $section_number;
-        $section_number = $command->{'extra'}->{'section_number'}
-          if ($command->{'extra'}
-              and defined($command->{'extra'}->{'section_number'}));
-        if ($section_number
-            and ($self->get_conf('NUMBER_SECTIONS')
-                 or !defined($self->get_conf('NUMBER_SECTIONS')))) {
-          my $substituted_strings
-            = {'number' => {'text' => $section_number},
-               'section_title'
-          => Texinfo::ManipulateTree::copy_treeNonXS($command->{'args'}->[0])};
-
-          if ($command->{'cmdname'} eq 'appendix'
-              and $command->{'extra'}->{'section_level'} == 1) {
-            $tree = $self->cdt('Appendix {number} {section_title}',
-                               $substituted_strings);
+        my $line_arg;
+        if ($root_commands{$command->{'cmdname'}}) {
+          $line_arg = $command->{'contents'}->[0]->{'contents'}->[0];
+        } else {
+          $line_arg = $command->{'args'}->[0];
+        }
+        if ($line_arg->{'contents'}) {
+          my $section_number;
+          $section_number = $command->{'extra'}->{'section_number'}
+            if ($command->{'extra'}
+                and defined($command->{'extra'}->{'section_number'}));
+          if ($section_number
+              and ($self->get_conf('NUMBER_SECTIONS')
+                   or !defined($self->get_conf('NUMBER_SECTIONS')))) {
+            my $substituted_strings
+              = {'number' => {'text' => $section_number},
+                 'section_title'
+                => Texinfo::ManipulateTree::copy_treeNonXS($line_arg)};
+
+            if ($command->{'cmdname'} eq 'appendix'
+                and $command->{'extra'}->{'section_level'} == 1) {
+              $tree = $self->cdt('Appendix {number} {section_title}',
+                                 $substituted_strings);
+            } else {
+              # TRANSLATORS: numbered section title
+              $tree = $self->cdt('{number} {section_title}',
+                                 $substituted_strings);
+            }
           } else {
-            # TRANSLATORS: numbered section title
-            $tree = $self->cdt('{number} {section_title}',
-                               $substituted_strings);
+            $tree = $line_arg;
           }
-        } else {
-          $tree = $command->{'args'}->[0];
         }
 
-        $target->{'tree_nonumber'}
-          = $command->{'args'}->[0];
+        $target->{'tree_nonumber'} = $line_arg;
       }
       $target->{'tree'} = $tree;
     }
@@ -4586,8 +4590,9 @@ sub _convert_heading_command($$$$$)
         if ($element->{'extra'} and $element->{'extra'}->{'associated_node'});
 
       if ($node) {
+        my $argument = $node->{'contents'}->[0];
         my $automatic_directions = 1;
-        if ($node->{'args'} and scalar(@{$node->{'args'}}) > 1) {
+        if (scalar(@{$argument->{'contents'}}) > 1) {
           $automatic_directions = 0;
         }
 
@@ -11127,10 +11132,9 @@ sub _file_header_information($$;$)
       my $element_tree;
       if ($self->get_conf('SECTION_NAME_IN_TITLE')
           and $command->{'extra'}
-          and $command->{'extra'}->{'associated_section'}
-          and $command->{'extra'}->{'associated_section'}->{'args'}
-          and $command->{'extra'}->{'associated_section'}->{'args'}->[0]) {
-        $element_tree = 
$command->{'extra'}->{'associated_section'}->{'args'}->[0];
+          and $command->{'extra'}->{'associated_section'}){
+        $element_tree = $command->{'extra'}->{'associated_section'}
+            ->{'contents'}->[0]->{'contents'}->[0];
       } else {
         # this should not happen, as the command_string should be empty already
         $element_tree = $self->command_tree($command);
@@ -12613,6 +12617,13 @@ sub _prepare_converted_output_info($$$$)
         last;
       }
     }
+    if (!$fulltitle_tree and $global_commands->{'top'}) {
+      my $argument = $global_commands->{'top'}->{'contents'}->[0];
+      my $line_arg = $argument->{'contents'}->[0];
+      if ($line_arg->{'contents'}) {
+        $fulltitle_tree = $line_arg;
+      }
+    }
     if (!$fulltitle_tree and $global_commands->{'titlefont'}
         and $global_commands->{'titlefont'}->[0]->{'contents'}
         and $global_commands->{'titlefont'}->[0]->{'contents'}->[0]
@@ -12951,12 +12962,14 @@ sub _node_redirections($$$$)
             }
           } elsif ($file_info_type eq 'node') {
             my $conflicting_node = $file_source->{'file_info_element'};
+            my $label_element
+              = Texinfo::Common::get_label_element($conflicting_node);
             $self->converter_line_warn(
          sprintf(__p('conflict of redirection file with file based on node 
name',
                      "conflict with \@%s `%s' file"),
                  $conflicting_node->{'cmdname'},
                  Texinfo::Convert::Texinfo::convert_to_texinfo({'contents'
-                   => $conflicting_node->{'args'}->[0]->{'contents'}}),
+                                => $label_element->{'contents'}})
                  ),
               $conflicting_node->{'source_info'}, 1);
           } elsif ($file_info_type eq 'redirection') {
@@ -12977,7 +12990,8 @@ sub _node_redirections($$$$)
                      "conflict with \@%s `%s' file"),
                  $conflicting_section->{'cmdname'},
                  Texinfo::Convert::Texinfo::convert_to_texinfo({'contents'
-                   => $conflicting_section->{'args'}->[0]->{'contents'}}),
+                   => $conflicting_section->{'contents'}->[0]
+                                        ->{'contents'}->[0]->{'contents'}}),
                  ),
               $conflicting_section->{'source_info'}, 1);
           } elsif ($file_info_type eq 'special_unit') {
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index c49be67fc3..2669f353a1 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -3531,7 +3531,7 @@ sub _convert($$)
             if (defined($self->get_conf('xrefautomaticsectiontitle'))
                 and $self->get_conf('xrefautomaticsectiontitle') eq 'on'
                 and $section_command) {
-              $name = $section_command->{'args'}->[0];
+              $name = $section_command->{'contents'}->[0]->{'contents'}->[0];
             } else {
               $name = {'contents' => $reference_node_content};
             }
@@ -3970,7 +3970,8 @@ sub _convert($$)
         if (!$element->{'extra'}
             or not $element->{'extra'}->{'associated_section'}) {
           my $node_label
-            = _tree_anchor_label($element->{'args'}->[0]->{'contents'});
+            = _tree_anchor_label(
+                $element->{'contents'}->[0]->{'contents'}->[0]->{'contents'});
           $result .= "\\label{$node_label}%\n";
         }
       } else {
@@ -3980,7 +3981,13 @@ sub _convert($$)
         }
         if (not $self->{'formatting_context'}->[-1]->{'in_skipped_node_top'}) {
           my $heading = '';
-          if ($element->{'args'}->[0]->{'contents'}) {
+          my $line_arg;
+          if ($root_commands{$element->{'cmdname'}}) {
+            $line_arg = $element->{'contents'}->[0]->{'contents'}->[0];
+          } else {
+            $line_arg = $element->{'args'}->[0];
+          }
+          if ($line_arg->{'contents'}) {
             # It is useful to know that this is a heading formatting as
             # the formatted heading is in the table of content, and some
             # formatting may be different for that case, for instance with
@@ -3988,7 +3995,7 @@ sub _convert($$)
             $self->{'formatting_context'}->[-1]
                                   ->{'in_sectioning_command_heading'} = 1;
             $heading = $self->_convert(
-                        {'contents' => $element->{'args'}->[0]->{'contents'}});
+                        {'contents' => $line_arg->{'contents'}});
             $self->{'formatting_context'}->[-1]
                                   ->{'in_sectioning_command_heading'} = 0;
           }
@@ -4010,7 +4017,8 @@ 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->{'args'}->[0]->{'contents'});
+            = _tree_anchor_label(
+             
$associated_node->{'contents'}->[0]->{'contents'}->[0]->{'contents'});
           $result .= "\\label{$node_label}%\n";
         }
       }
diff --git a/tp/Texinfo/Convert/NodeNameNormalization.pm 
b/tp/Texinfo/Convert/NodeNameNormalization.pm
index f58212b3cb..fe2f397c6f 100644
--- a/tp/Texinfo/Convert/NodeNameNormalization.pm
+++ b/tp/Texinfo/Convert/NodeNameNormalization.pm
@@ -280,7 +280,11 @@ sub _convert($)
                  or ($element->{'args'} and $element->{'args'}->[0]
                      and $element->{'args'}->[0]->{'type'}
                      and ($element->{'args'}->[0]->{'type'} eq 'line_arg'
-                         or $element->{'args'}->[0]->{'type'} eq 
'rawline_arg')))));
+                         or $element->{'args'}->[0]->{'type'} eq 'rawline_arg')
+                 or ($element->{'contents'}
+                     and $element->{'contents'}->[0]->{'contents'}
+             and $element->{'contents'}->[0]->{'contents'}->[0]->{'type'}
+   and $element->{'contents'}->[0]->{'contents'}->[0]->{'type'} eq 
'line_arg')))));
   if ($element->{'cmdname'}) {
     my $cmdname = $element->{'cmdname'};
     if (defined($normalize_node_nobrace_symbol_text{$cmdname})) {
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 7ec0a8d35d..d1387ec537 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -1272,7 +1272,7 @@ sub process_footnotes($;$)
       $node_element = $element->{'unit_command'};
       if ($node_element->{'extra'}
           and defined($node_element->{'extra'}->{'normalized'})) {
-        $label_element = $node_element->{'args'}->[0];
+        $label_element = $node_element->{'contents'}->[0]->{'contents'}->[0];
       }
     }
 
@@ -1291,7 +1291,8 @@ sub process_footnotes($;$)
                'contents' => [$label_element, {'text' => '-Footnotes'}]};
       my $footnotes_node = {
         'cmdname' => 'node',
-        'args' => [$footnotes_node_arg],
+        'contents' => [{'type' => 'argument',
+                        'contents' => [$footnotes_node_arg],}],
         'extra' => {'is_target' => 1,
                 'normalized'
                   => $node_element->{'extra'}->{'normalized'}.'-Footnotes',
@@ -1528,6 +1529,8 @@ sub format_contents($$$)
     my $section = $top_section;
  SECTION:
     while ($section) {
+      my $argument = $section->{'contents'}->[0];
+      my $line_arg = $argument->{'contents'}->[0];
       my $section_title_tree;
       if (defined($section->{'extra'}->{'section_number'})
           and ($self->get_conf('NUMBER_SECTIONS')
@@ -1537,15 +1540,15 @@ sub format_contents($$$)
           $section_title_tree = $self->cdt('Appendix {number} {section_title}',
                {'number' => {'text'
                                => $section->{'extra'}->{'section_number'}},
-                'section_title' => $section->{'args'}->[0]});
+                'section_title' => $line_arg});
         } else {
           $section_title_tree = $self->cdt('{number} {section_title}',
                {'number' => {'text'
                                => $section->{'extra'}->{'section_number'}},
-                'section_title' => $section->{'args'}->[0]});
+                'section_title' => $line_arg});
         }
       } else {
-        $section_title_tree = $section->{'args'}->[0];
+        $section_title_tree = $line_arg;
       }
       my $repeat_count
         = 2 * ($section->{'extra'}->{'section_level'} - ($root_level+1));
@@ -3196,7 +3199,7 @@ sub _convert($$)
              'contents' => [
                {'type' => 'brace_arg',
                 'contents' => [
-                   $self->{'current_node'}->{'args'}->[0],
+                   
$self->{'current_node'}->{'contents'}->[0]->{'contents'}->[0],
                    {'text' => "-Footnote-$self->{'footnote_index'}"}
                 ]
                }
@@ -3528,10 +3531,14 @@ sub _convert($$)
       # use settitle for empty @top
       # ignore @part
       my $heading_element;
-      if ($element->{'args'}
-          and $element->{'args'}->[0]->{'contents'}
-          and $cmdname ne 'part') {
-        $heading_element = $element->{'args'}->[0];
+      my $line_arg;
+      if ($root_commands{$cmdname}) {
+        $line_arg = $element->{'contents'}->[0]->{'contents'}->[0];
+      } else {
+        $line_arg = $element->{'args'}->[0];
+      }
+      if ($cmdname ne 'part' and $line_arg->{'contents'}) {
+        $heading_element = $line_arg;
       } elsif ($cmdname eq 'top') {
         my $global_commands;
         if ($self->{'document'}) {
diff --git a/tp/Texinfo/Convert/Texinfo.pm b/tp/Texinfo/Convert/Texinfo.pm
index 85b8a0f2df..5518589e33 100644
--- a/tp/Texinfo/Convert/Texinfo.pm
+++ b/tp/Texinfo/Convert/Texinfo.pm
@@ -170,15 +170,15 @@ sub root_heading_command_to_texinfo($)
   if ($element->{'cmdname'}) {
     if (($element->{'cmdname'} eq 'node'
          or $sectioning_heading_commands{$element->{'cmdname'}})
-        and $element->{'args'}->[0]->{'contents'}) {
-      $tree = $element->{'args'}->[0]->{'contents'};
+        and $element->{'contents'}->[0]->{'contents'}->[0]->{'contents'}) {
+      $tree = $element->{'contents'}->[0]->{'contents'}->[0];
     }
   } else {
     return "Not a command";
   }
   if ($tree) {
     return '@'.$element->{'cmdname'}.' '
-                .convert_to_texinfo({'contents' => $tree});
+                .convert_to_texinfo({'contents' => $tree->{'contents'}});
   } else {
     return '@'.$element->{'cmdname'};
   }
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm 
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index 603d1d942e..706ce5cd07 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -913,10 +913,12 @@ sub _convert($$;$)
           $result .= $self->txi_markup_open_element('node',
                           [['name', $nodename], 
_leading_spaces_arg($element)]);
           push @{$self->{'document_context'}->[-1]->{'monospace'}}, 1;
+          my $argument = $element->{'contents'}->[0];
+          my $line_arg = $argument->{'contents'}->[0];
           $result .= $self->txi_markup_open_element('nodename',
-                               
[_trailing_spaces_arg($element->{'args'}->[0])]);
+                               [_trailing_spaces_arg($line_arg)]);
           $result .= $self->_convert({'contents'
-                                  => $element->{'args'}->[0]->{'contents'}})
+                                  => $line_arg->{'contents'}})
             if ($nodename ne '');
           $result .= $self->txi_markup_close_element('nodename');
           # first arg is the node name, directions start at 1.
@@ -930,16 +932,15 @@ sub _convert($$;$)
                   = $element->{'extra'}->{'node_directions'}->{lc($direction)};
               my $node_name = '';
               my $attributes = [];
-              if ($element->{'args'} and 
$element->{'args'}->[$direction_index]) {
+              if ($argument->{'contents'}->[$direction_index]) {
                 push @$attributes, _leading_trailing_spaces_arg(
-                                 $element->{'args'}->[$direction_index]);
+                                 $argument->{'contents'}->[$direction_index]);
               }
-              if (!$element->{'args'}
-                  or scalar(@{$element->{'args'}}) < $direction_index +1
-                  or 
!defined($element->{'args'}->[$direction_index]->{'extra'})
-                  or !(defined($element->{'args'}->[$direction_index]
+              if (scalar(@{$argument->{'contents'}}) < $direction_index +1
+                  or 
!defined($argument->{'contents'}->[$direction_index]->{'extra'})
+                  or !(defined($argument->{'contents'}->[$direction_index]
                                                     
->{'extra'}->{'manual_node'}
-                       or defined($element->{'args'}->[$direction_index]
+                       or defined($argument->{'contents'}->[$direction_index]
                                                      
->{'extra'}->{'normalized'})))) {
                 push @$attributes, ['automatic', 'on'];
 
@@ -952,7 +953,7 @@ sub _convert($$;$)
                 }
               } else {
                 $node_name
-                  = $self->_convert($element->{'args'}->[$direction_index]);
+                  = 
$self->_convert($argument->{'contents'}->[$direction_index]);
               }
               $result .= "$pending_empty_directions".
                 $self->txi_markup_open_element($format_element, $attributes)
@@ -960,11 +961,11 @@ sub _convert($$;$)
                 $self->txi_markup_close_element($format_element);
               $pending_empty_directions = '';
             } else {
-              if ($element->{'args'}->[$direction_index]) {
+              if ($argument->{'contents'}->[$direction_index]) {
                 $pending_empty_directions .=
                   $self->txi_markup_open_element($format_element,
                     [_leading_trailing_spaces_arg(
-                                 $element->{'args'}->[$direction_index])])
+                                 $argument->{'contents'}->[$direction_index])])
                             .$self->txi_markup_close_element($format_element);
               }
             }
@@ -992,16 +993,12 @@ sub _convert($$;$)
             $closed_section_element = '';
           }
 
-          if ($element->{'args'} and $element->{'args'}->[0]) {
-            my ($arg, $end_space, $end_line)
-               = $self->_convert_argument_and_end_line($element);
-            $result .= $self->txi_markup_open_element('sectiontitle')
-                      .$arg.$end_space
-                      .$self->txi_markup_close_element('sectiontitle')
-                      .$closed_section_element.$end_line;
-          } else {
-            $result .= $closed_section_element;
-          }
+          my ($arg, $end_space, $end_line)
+             = $self->_convert_argument_and_end_line($element);
+          $result .= $self->txi_markup_open_element('sectiontitle')
+                    .$arg.$end_space
+                    .$self->txi_markup_close_element('sectiontitle')
+                    .$closed_section_element.$end_line;
         } elsif ($Texinfo::Commands::def_commands{$cmdname}) {
           $result .= _convert_def_line($self, $element);
           return $result;
diff --git a/tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm
index fd5e54e94b..21029a0fb9 100644
--- a/tp/Texinfo/Convert/Text.pm
+++ b/tp/Texinfo/Convert/Text.pm
@@ -712,22 +712,26 @@ sub _convert($$)
         chomp ($result);
         $result .= "\n" if ($result =~ /\S/);
       }
-    } elsif ($formatted_line_commands{$data_cmdname}
-             and $element->{'args'}) {
+    } elsif ($Texinfo::Commands::sectioning_heading_commands{$cmdname}) {
+      my $line_arg;
+      if ($Texinfo::Commands::root_commands{$cmdname}) {
+        $line_arg = $element->{'contents'}->[0]->{'contents'}->[0];
+      } else {
+        $line_arg = $element->{'args'}->[0];
+      }
+      my $heading_text = _convert($options, $line_arg);
+      $result = _text_heading($element, $heading_text, $options->{'converter'},
+                               $options->{'NUMBER_SECTIONS'});
+    } elsif ($formatted_line_commands{$data_cmdname} and $element->{'args'}) {
       if ($cmdname ne 'node') {
         if ($cmdname eq 'page') {
           $result = '';
         } else {
           $result = _convert($options, $element->{'args'}->[0]);
         }
-        if ($Texinfo::Commands::sectioning_heading_commands{$cmdname}) {
-          $result = _text_heading($element, $result, $options->{'converter'},
-                                 $options->{'NUMBER_SECTIONS'});
-        } else {
         # we always want an end of line even if is was eaten by a command
-          chomp($result);
-          $result .= "\n";
-        }
+        chomp($result);
+        $result .= "\n";
       }
     } elsif ($converted_formattable_line_commands{$cmdname}) {
       if ($def_commands{$cmdname}) {
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 03f8f9b4eb..d0631f296f 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -1509,7 +1509,7 @@ sub _close_brace_command($$$;$$$)
 
   # args are always set except in cases of bogus brace @-commands
   # without argument, maybe only at the end of a document.
-  #die ("$current->{'cmdname'} no args\n") if (!$current->{'args'});
+  #die ("$current->{'cmdname'} no args\n") if (!$current->{'contents'});
 
   if ($self->{'basic_inline_commands'}
       and $self->{'basic_inline_commands'}->{$current->{'cmdname'}}) {
@@ -3672,7 +3672,21 @@ sub _end_line_misc_line($$$)
 
   my $document = $self->{'document'};
 
-  my $command = $current->{'parent'}->{'cmdname'};
+  my $command_element;
+  my $line_arg;
+  if ($current->{'parent'}->{'type'}
+      and $current->{'parent'}->{'type'} eq 'argument') {
+    $command_element = $current->{'parent'}->{'parent'};
+    $line_arg = $command_element->{'contents'}->[0]->{'contents'}->[0];
+  } else {
+    $command_element = $current->{'parent'};
+    if ($def_commands{$command_element->{'cmdname'}}) {
+      $line_arg = $command_element->{'contents'}->[0];
+    } else {
+      $line_arg = $command_element->{'args'}->[0];
+    }
+  }
+  my $command = $command_element->{'cmdname'};
   my $data_cmdname = $command;
 
   # we are in a command line context, so the @item command information is
@@ -3693,7 +3707,7 @@ sub _end_line_misc_line($$$)
 
   _pop_context($self, ['ct_line'], $source_info, $current, 'in line_arg');
 
-  $current = $current->{'parent'};
+  $current = $command_element;
   my $misc_cmd = $current;
   my $end_command;
   my $included_file;
@@ -3875,8 +3889,9 @@ sub _end_line_misc_line($$$)
                      $command, $texi_line);
     }
   } elsif ($command eq 'node') {
-    for (my $i = 1; $i < scalar(@{$current->{'args'}}); $i++) {
-      my $arg = $current->{'args'}->[$i];
+    my $argument = $current->{'contents'}->[0];
+    for (my $i = 1; $i < scalar(@{$argument->{'contents'}}); $i++) {
+      my $arg = $argument->{'contents'}->[$i];
       my $arg_label_manual_info
         = Texinfo::Common::parse_node_manual($arg, 1);
       if (defined($arg_label_manual_info)) {
@@ -3894,7 +3909,7 @@ sub _end_line_misc_line($$$)
         }
       }
     }
-    my $label_element = $current->{'args'}->[0];
+    my $label_element = $argument->{'contents'}->[0];
     if (not $label_element or not $label_element->{'contents'}) {
       $self->_line_error(
         sprintf(__("empty argument in \@%s"),
@@ -3928,7 +3943,7 @@ sub _end_line_misc_line($$$)
     }
     # Handle all the other 'line' commands.  Here just check that they
     # have an argument.  Empty @top is allowed
-    if (!$current->{'args'}->[0]->{'contents'} and $command ne 'top') {
+    if (!$line_arg->{'contents'} and $command ne 'top') {
       $self->_command_warn($current,
              __("\@%s missing argument"), $command);
     } else {
@@ -5068,28 +5083,35 @@ sub _check_valid_nesting {
   # error messages for forbidden constructs, like @node in @r,
   # block command on line command, @xref in @anchor or node...
   if ($current->{'parent'}) {
-    if ($current->{'parent'}->{'cmdname'}) {
+    my $parent_command;
+    if ($current->{'parent'}->{'type'}
+        and $current->{'parent'}->{'type'} eq 'argument') {
+      $parent_command = $current->{'parent'}->{'parent'};
+    } else {
+      $parent_command = $current->{'parent'};
+    }
+    if ($parent_command->{'cmdname'}) {
       if (defined($self->{'valid_nestings'}
-                                   ->{$current->{'parent'}->{'cmdname'}})
+                                   ->{$parent_command->{'cmdname'}})
           and !$self->{'valid_nestings'}
-                             ->{$current->{'parent'}->{'cmdname'}}->{$command}
+                             ->{$parent_command->{'cmdname'}}->{$command}
           # we make sure that we are on a root @-command line and
           # not in contents
-          and (!$root_commands{$current->{'parent'}->{'cmdname'}}
+          and (!$root_commands{$parent_command->{'cmdname'}}
                or ($current->{'type'}
                    and $current->{'type'} eq 'line_arg'))
           # we make sure that we are on a block @-command line and
           # not in contents
-          and (!defined($block_commands{$current->{'parent'}->{'cmdname'}})
+          and (!defined($block_commands{$parent_command->{'cmdname'}})
                or ($current->{'type'}
                    and $current->{'type'} eq 'block_line_arg'))
           # we make sure that we are on an @item/@itemx line and
           # not in an @enumerate, @multitable or @itemize @item.
-          and (($current->{'parent'}->{'cmdname'} ne 'itemx'
-                and $current->{'parent'}->{'cmdname'} ne 'item')
+          and (($parent_command->{'cmdname'} ne 'itemx'
+                and $parent_command->{'cmdname'} ne 'item')
                or ($current->{'type'}
                         and $current->{'type'} eq 'line_arg'))) {
-        $invalid_parent = $current->{'parent'}->{'cmdname'};
+        $invalid_parent = $parent_command->{'cmdname'};
       }
     }
   }
@@ -5977,6 +5999,11 @@ sub _handle_line_command($$$$$$)
     if ($def_commands{$data_cmdname}) {
       $current->{'contents'} = [{ 'type' => 'line_arg',
                                   'parent' => $current }];
+    } elsif ($root_commands{$data_cmdname}) {
+      my $argument = {'type' => 'argument', 'parent' => $current};
+      $current->{'contents'} = [$argument];
+      $argument->{'contents'} = [{ 'type' => 'line_arg',
+                                  'parent' => $argument }];
     } else {
       $current->{'args'} = [{ 'type' => 'line_arg',
                               'parent' => $current }];
@@ -6038,6 +6065,9 @@ sub _handle_line_command($$$$$$)
 
     if ($def_commands{$data_cmdname}) {
       $current = $current->{'contents'}->[-1];
+    } elsif ($root_commands{$data_cmdname}) {
+      $current = $current->{'contents'}->[0]->{'contents'}->[-1];
+      $self->_push_context('ct_line', $command);
     } else {
       $current = $current->{'args'}->[-1];
       $self->_push_context('ct_line', $command);
@@ -7627,8 +7657,15 @@ sub _process_remaining_on_line($$$$)
          = _handle_comma($self, $current, $line, $source_info);
     } elsif ($current->{'type'}
              and $current->{'type'} eq 'line_arg'
-             and $current->{'parent'}->{'cmdname'}
-             and $current->{'parent'}->{'cmdname'} eq 'node') {
+             # this avoids detecting the comma in @cindex as being on the
+             # node line in the following case:
+             # @node some node
+             #
+             # @cindex a, b
+             and !$current->{'parent'}->{'cmdname'}
+             and $current->{'parent'}->{'parent'}
+             and $current->{'parent'}->{'parent'}->{'cmdname'}
+             and $current->{'parent'}->{'parent'}->{'cmdname'} eq 'node') {
       $self->_line_warn(__("superfluous arguments for node"), $source_info);
     } else {
       $current = _merge_text($self, $current, $comma);
@@ -7966,7 +8003,12 @@ sub _parse_line_command_args($$$)
   my $args;
 
   my $command = $line_command->{'cmdname'};
-  my $arg = $line_command->{'args'}->[0];
+  my $line_arg;
+  if ($root_commands{$command}) {
+    $line_arg = $line_command->{'contents'}->[0]->{'contents'}->[0];
+  } else {
+    $line_arg = $line_command->{'args'}->[0];
+  }
 
   # Not in XS parser.  Could be added if deemded interesting, but
   # arguments are already checked below.
@@ -7982,20 +8024,20 @@ sub _parse_line_command_args($$$)
   #  }
   #}
 
-  if (!$arg->{'contents'}) {
+  if (!$line_arg->{'contents'}) {
     $self->_command_error($line_command,
                __("\@%s missing argument"), $command);
     return undef;
   }
 
-  if (scalar(@{$arg->{'contents'}}) > 1
-         or (!defined($arg->{'contents'}->[0]->{'text'}))) {
+  if (scalar(@{$line_arg->{'contents'}}) > 1
+         or (!defined($line_arg->{'contents'}->[0]->{'text'}))) {
     $self->_line_error(sprintf(__("superfluous argument to \@%s"),
        $command), $source_info);
   }
-  return undef if (!defined($arg->{'contents'}->[0]->{'text'}));
+  return undef if (!defined($line_arg->{'contents'}->[0]->{'text'}));
 
-  my $line = $arg->{'contents'}->[0]->{'text'};
+  my $line = $line_arg->{'contents'}->[0]->{'text'};
 
   if ($command eq 'alias') {
     # REMACRO
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index feef206072..07c2f7562c 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -528,8 +528,9 @@ sub check_nodes_are_referenced($)
       # the nodes appearing in the automatic menu are referenced.
       # Note that the menu may not be actually setup, but
       # it is better not to warn for nothing.
+      my $argument = $node->{'contents'}->[0];
       my $automatic_directions
-        = (not ($node->{'args'} and scalar(@{$node->{'args'}}) > 1));
+        = (not (scalar(@{$argument->{'contents'}}) > 1));
       if ($automatic_directions) {
         my @node_childs = get_node_node_childs_from_sectioning($node);
         foreach my $node_child (@node_childs) {
@@ -722,8 +723,9 @@ sub complete_node_tree_with_menus($)
   my %cached_menu_nodes;
   # Go through all the nodes
   foreach my $node (@{$nodes_list}) {
+    my $argument = $node->{'contents'}->[0];
     my $automatic_directions
-      = (not ($node->{'args'} and scalar(@{$node->{'args'}}) > 1));
+      = (not (scalar(@{$argument->{'contents'}}) > 1));
 
     my $normalized = $node->{'extra'}->{'normalized'};
     my $menu_directions = $node->{'extra'}->{'menu_directions'};
@@ -936,8 +938,9 @@ sub nodes_tree($)
     }
     push @nodes_list, $node;
 
+    my $argument = $node->{'contents'}->[0];
     my $automatic_directions
-      = (not ($node->{'args'} and scalar(@{$node->{'args'}}) > 1));
+      = (not (scalar(@{$argument->{'contents'}}) > 1));
 
     if ($automatic_directions) {
       if (!$top_node or $node ne $top_node) {
@@ -992,8 +995,8 @@ sub nodes_tree($)
         }
       }
     } else { # explicit directions
-      for (my $i = 1; $i < scalar(@{$node->{'args'}}); $i++) {
-        my $direction_element = $node->{'args'}->[$i];
+      for (my $i = 1; $i < scalar(@{$argument->{'contents'}}); $i++) {
+        my $direction_element = $argument->{'contents'}->[$i];
         my $direction = $node_directions_names[$i-1];
 
         # external node
@@ -1187,7 +1190,7 @@ sub new_node_menu_entry
 
   my $node_name_element;
   if ($node->{'extra'} and $node->{'extra'}->{'is_target'}) {
-    $node_name_element = $node->{'args'}->[0];
+    $node_name_element = $node->{'contents'}->[0]->{'contents'}->[0];
   }
 
   # can happen with node without argument or with empty argument
@@ -1198,7 +1201,8 @@ sub new_node_menu_entry
     my $name_element;
     if (defined $node->{'extra'}->{'associated_section'}) {
       $name_element
-        = $node->{'extra'}->{'associated_section'}->{'args'}->[0];
+        = $node->{'extra'}->{'associated_section'}
+              ->{'contents'}->[0]->{'contents'}->[0];
     } else {
       $name_element = $node_name_element; # shouldn't happen
     }
@@ -1282,9 +1286,11 @@ sub new_block_command($$)
 
   $element->{'cmdname'} = $command_name;
 
-  $element->{'args'} = [{'type' => 'block_line_arg', 'parent' => $element,
+  my $argument = {'type' => 'argument', 'parent' => $element};
+  $argument->{'contents'} = [{'type' => 'block_line_arg', 'parent' => 
$argument,
                            'info' => { 'spaces_after_argument' =>
                                         {'text' => "\n",}}}];
+  unshift @{$element->{'contents'}}, $argument;
 
   my $end = {'cmdname' => 'end', 'parent' => $element,
              'extra' => {'text_arg' => $command_name}};
@@ -1375,11 +1381,11 @@ sub new_complete_node_menu
       if ($child_section) {
         my $part_added = 0;
         my $associated_part = $child_section->{'extra'}->{'associated_part'};
-        if ($associated_part and $associated_part->{'args'}
-            and scalar(@{$associated_part->{'args'}}) > 0) {
+        if ($associated_part) {
+          my $part_line_arg
+            = $associated_part->{'contents'}->[0]->{'contents'}->[0];
           my $part_title_copy
-            = Texinfo::ManipulateTree::copy_contentsNonXS(
-                                $associated_part->{'args'}->[0]);
+            = Texinfo::ManipulateTree::copy_contentsNonXS($part_line_arg);
           my $part_title
            = Texinfo::Translations::gdt('Part: {part_title}',
                     $customization_information->get_conf('documentlanguage'),
@@ -1556,9 +1562,10 @@ sub _print_down_menus($$$$$;$)
     my $node_name_element;
     if ($node->{'extra'}->{'associated_section'}) {
       my $associated_section = $node->{'extra'}->{'associated_section'};
-      $node_name_element = $associated_section->{'args'}->[0];
+      $node_name_element
+        = $associated_section->{'contents'}->[0]->{'contents'}->[0];
     } else {
-      $node_name_element = $node->{'args'}->[0];
+      $node_name_element = $node->{'contents'}->[0]->{'contents'}->[0];
     }
 
     my $node_title_copy
diff --git a/tp/Texinfo/Transformations.pm b/tp/Texinfo/Transformations.pm
index fbbdbf44bb..596f75e0dc 100644
--- a/tp/Texinfo/Transformations.pm
+++ b/tp/Texinfo/Transformations.pm
@@ -172,10 +172,13 @@ sub fill_gaps_in_sectioning($;$)
         };
         $new_section->{'info'} = {'spaces_before_argument' =>
                                               {'text' => ' ',}};
-        my $line_arg = {'type' => 'line_arg', 'parent' => $new_section,
+        my $argument = {'type' => 'argument', 'parent' => $new_section};
+
+        my $line_arg = {'type' => 'line_arg', 'parent' => $argument,
                         'info' => {'spaces_after_argument'
                                                  => {'text' => "\n",}}};
-        $new_section->{'args'} = [$line_arg];
+        $argument->{'contents'} = [$line_arg];
+
         my $line_content;
         if ($commands_heading_content) {
           $line_content
@@ -190,7 +193,8 @@ sub fill_gaps_in_sectioning($;$)
           $line_content = $asis_command;
         }
         $line_arg->{'contents'} = [$line_content];
-        $new_section->{'contents'} = [{'type' => 'empty_line',
+        $new_section->{'contents'} = [$argument,
+                                      {'type' => 'empty_line',
                                        'text' => "\n",
                                        'parent' => $new_section}];
         push @new_sections, $new_section;
@@ -372,8 +376,12 @@ sub _new_node($$;$)
 
     $node = {'cmdname' => 'node', 'extra' => {}};
     $node->{'info'} = {'spaces_before_argument' => {'text' => ' '}};
-    my $node_line_arg = {'type' => 'line_arg', 'parent' => $node};
-    $node->{'args'} = [$node_line_arg];
+
+    my $argument = {'type' => 'argument', 'parent' => $node};
+    $node->{'contents'} = [$argument];
+
+    my $node_line_arg = {'type' => 'line_arg', 'parent' => $argument};
+    $argument->{'contents'} = [$node_line_arg];
     $node_line_arg->{'info'} = {'spaces_after_argument' =>
                                      {'text' => $spaces_after_argument}};
     $node_line_arg->{'info'}->{'comment_at_end'} = $comment_at_end
@@ -471,8 +479,9 @@ sub insert_nodes_for_sectioning_commands($)
       if ($content->{'cmdname'} eq 'top') {
         $new_node_tree = {'contents' => [{'text' => 'Top'}]};
       } else {
+        my $line_arg = $content->{'contents'}->[0]->{'contents'}->[0];
         $new_node_tree
-         = 
Texinfo::ManipulateTree::copy_contentsNonXS($content->{'args'}->[0]);
+         = Texinfo::ManipulateTree::copy_contentsNonXS($line_arg);
       }
       my $new_node = _new_node($new_node_tree, $document,
                                $customization_information);
@@ -602,7 +611,7 @@ sub _get_non_automatic_nodes_with_sections($)
   my @non_automatic_nodes;
   foreach my $content (@{$root->{'contents'}}) {
     if ($content->{'cmdname'} and $content->{'cmdname'} eq 'node'
-        and not ($content->{'args'} and scalar(@{$content->{'args'}}) > 1)
+        and not (scalar(@{$content->{'contents'}->[0]->{'contents'}}) > 1)
         and $content->{'extra'}
         and $content->{'extra'}->{'associated_section'}) {
       push @non_automatic_nodes, $content;
diff --git a/tp/Texinfo/XS/convert/convert_html.c 
b/tp/Texinfo/XS/convert/convert_html.c
index 7298d6f0f0..f0eb74da99 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -843,7 +843,7 @@ html_prepare_title_titlepage (CONVERTER *self, const char 
*output_file,
 }
 
 static const enum command_id fulltitle_cmds[] =
- {CM_settitle, CM_title, CM_shorttitlepage, CM_top, 0};
+ {CM_settitle, CM_title, CM_shorttitlepage, 0};
 
 
 int
@@ -902,6 +902,17 @@ html_prepare_converted_output_info (CONVERTER *self, const 
char *output_file,
         }
     }
 
+  if (!fulltitle_tree
+      && self->document->global_commands.top)
+    {
+      const ELEMENT *argument
+       = self->document->global_commands.top->e.c->contents.list[0];
+      ELEMENT *line_arg = argument->e.c->contents.list[0];
+
+      if (line_arg->e.c->contents.number > 0)
+        fulltitle_tree = line_arg;
+    }
+
   if (!fulltitle_tree
       && self->document->global_commands.titlefont.number > 0
       && self->document->global_commands.titlefont.list[0]
@@ -2855,9 +2866,11 @@ html_node_redirections (CONVERTER *self,
                     {
                       const ELEMENT *conflicting_section
                         = file_source_info->element;
+                      const ELEMENT *line_arg
+                        = conflicting_section->e.c->contents.list[0]
+                                    ->e.c->contents.list[0];
                       char *section_texi
-                        = convert_contents_to_texinfo
-                                    (conflicting_section->e.c->args.list[0]);
+                        = convert_contents_to_texinfo (line_arg);
                      pmessage_list_command_warn (&self->error_messages,
                                     self->conf, conflicting_section, 1,
            "conflict of redirection file with file based on section name",
diff --git a/tp/Texinfo/XS/convert/converter.c 
b/tp/Texinfo/XS/convert/converter.c
index 03fb642cac..512635788e 100644
--- a/tp/Texinfo/XS/convert/converter.c
+++ b/tp/Texinfo/XS/convert/converter.c
@@ -1062,9 +1062,18 @@ normalized_sectioning_command_filename (CONVERTER *self, 
const ELEMENT *command)
      = (TARGET_FILENAME *) malloc (sizeof (TARGET_FILENAME));
   TEXT filename;
   char *normalized_file_name;
-  char *normalized_name
-    = normalize_transliterate_texinfo_contents (command->e.c->args.list[0],
+  char *normalized_name;
+  const ELEMENT *label_element;
+
+  if (builtin_command_data[command->e.c->cmd].flags & CF_root)
+    label_element = command->e.c->contents.list[0]->e.c->contents.list[0];
+  else
+    label_element = command->e.c->args.list[0];
+
+  normalized_name
+    = normalize_transliterate_texinfo_contents (label_element,
                                            (self->conf->TEST.o.integer > 0));
+
   normalized_file_name = strdup (normalized_name);
   id_to_filename (self, &normalized_file_name);
 
diff --git a/tp/Texinfo/XS/convert/format_html.c 
b/tp/Texinfo/XS/convert/format_html.c
index c789af40cc..17f71338a9 100644
--- a/tp/Texinfo/XS/convert/format_html.c
+++ b/tp/Texinfo/XS/convert/format_html.c
@@ -1790,7 +1790,8 @@ html_internal_command_tree (CONVERTER *self, const 
ELEMENT *command,
               if (command->e.c->cmd == CM_anchor)
                 label_element = command->e.c->contents.list[0];
               else
-                label_element = command->e.c->args.list[0];
+                label_element
+                  = command->e.c->contents.list[0]->e.c->contents.list[0];
               add_to_contents_as_array (root_code, label_element);
               tree->tree = root_code;
               add_tree_to_build (self, tree->tree);
@@ -1801,59 +1802,67 @@ html_internal_command_tree (CONVERTER *self, const 
ELEMENT *command,
               tree->status = tree_added_status_new_tree;
               add_tree_to_build (self, tree->tree);
             }
-          else if (command->e.c->args.number <= 0
-                   || command->e.c->args.list[0]->e.c->contents.number <= 0)
-            { /* no argument, nothing to do */
-              tree->status = tree_added_status_no_tree;
-            }
           else
             {
-              const char *section_number
-                = lookup_extra_string (command, AI_key_section_number);
-              if (section_number && self->conf->NUMBER_SECTIONS.o.integer != 0)
+              ELEMENT *line_arg;
+
+              if (builtin_command_data[command->e.c->cmd].flags & CF_root)
+                line_arg
+                  = command->e.c->contents.list[0]->e.c->contents.list[0];
+              else
+                line_arg = command->e.c->args.list[0];
+
+              if (line_arg->e.c->contents.number > 0)
                 {
-                  NAMED_STRING_ELEMENT_LIST *replaced_substrings
-                    = new_named_string_element_list ();
-                  ELEMENT *e_number = new_text_element (ET_normal_text);
-                  ELEMENT *section_title_copy
-                     = copy_tree (command->e.c->args.list[0]);
-
-                  add_element_to_named_string_element_list (
-                              replaced_substrings, "section_title",
-                              section_title_copy);
-                  text_append (e_number->e.text, section_number);
-                  add_element_to_named_string_element_list (
-                              replaced_substrings, "number", e_number);
-
-                  if (command->e.c->cmd == CM_appendix)
+                  const char *section_number;
+                  section_number
+                    = lookup_extra_string (command, AI_key_section_number);
+
+                  if (section_number
+                      && self->conf->NUMBER_SECTIONS.o.integer != 0)
                     {
-                      int status;
-                      int section_level = lookup_extra_integer (command,
-                                               AI_key_section_level, &status);
-                      if (section_level == 1)
+                      NAMED_STRING_ELEMENT_LIST *replaced_substrings
+                        = new_named_string_element_list ();
+                      ELEMENT *e_number = new_text_element (ET_normal_text);
+                      ELEMENT *section_title_copy = copy_tree (line_arg);
+
+                      add_element_to_named_string_element_list (
+                                  replaced_substrings, "section_title",
+                                  section_title_copy);
+                      text_append (e_number->e.text, section_number);
+                      add_element_to_named_string_element_list (
+                                  replaced_substrings, "number", e_number);
+
+                      if (command->e.c->cmd == CM_appendix)
                         {
-                          tree->tree
-                            = html_cdt_tree (
+                          int status;
+                          int section_level = lookup_extra_integer (command,
+                                               AI_key_section_level, &status);
+                          if (section_level == 1)
+                            {
+                              tree->tree
+                                = html_cdt_tree (
                                         "Appendix {number} {section_title}",
                                         self, replaced_substrings, 0);
+                            }
                         }
+                      if (!tree->tree)
+                        /* TRANSLATORS: numbered section title */
+                        tree->tree = html_cdt_tree ("{number} {section_title}",
+                                                 self, replaced_substrings, 0);
+
+                      destroy_named_string_element_list (replaced_substrings);
+                      tree->status = tree_added_status_new_tree;
+                      add_tree_to_build (self, tree->tree);
+                    }
+                  else
+                    {
+                      tree->status = tree_added_status_reused_tree;
+                      tree->tree = line_arg;
                     }
-                  if (!tree->tree)
-                    /* TRANSLATORS: numbered section title */
-                    tree->tree = html_cdt_tree ("{number} {section_title}",
-                                             self, replaced_substrings, 0);
-
-                  destroy_named_string_element_list (replaced_substrings);
-                  tree->status = tree_added_status_new_tree;
-                  add_tree_to_build (self, tree->tree);
-                }
-              else
-                {
-                  tree->status = tree_added_status_reused_tree;
-                  tree->tree = command->e.c->args.list[0];
                 }
 
-              target_info->tree_nonumber.tree = command->e.c->args.list[0];
+              target_info->tree_nonumber.tree = line_arg;
               target_info->tree_nonumber.status = 
tree_added_status_reused_tree;
             }
         }
@@ -3696,9 +3705,10 @@ file_header_information (CONVERTER *self, const ELEMENT 
*command,
             {
               const ELEMENT *associated_section
                 = lookup_extra_element (command, AI_key_associated_section);
-              if (associated_section && associated_section->e.c->args.number > 
0)
+              if (associated_section)
                 {
-                  command_tree = associated_section->e.c->args.list[0];
+                  command_tree = associated_section->e.c->contents.list[0]
+                                                     ->e.c->contents.list[0];
                 }
             }
 
@@ -7162,7 +7172,8 @@ html_convert_heading_command (CONVERTER *self, const enum 
command_id cmd,
             = lookup_extra_element (element, AI_key_associated_node);
           if (node)
             {
-              int automatic_directions = (node->e.c->args.number <= 1);
+              const ELEMENT *argument = node->e.c->contents.list[0];
+              int automatic_directions = (argument->e.c->contents.number <= 1);
               const CONST_ELEMENT_LIST *menus = lookup_extra_contents (node,
                                                               AI_key_menus);
               if (!menus && automatic_directions)
@@ -10870,7 +10881,7 @@ html_open_quotation_command (CONVERTER *self, const 
enum command_id cmd,
   const char *cmdname = element_command_name (element);
   char *formatted_quotation_arg_to_prepend = 0;
   const ELEMENT *argument = element->e.c->contents.list[0];
-  const ELEMENT *block_line_args = argument->e.c->contents.list[0];
+  ELEMENT *block_line_args = argument->e.c->contents.list[0];
 
   if (block_line_args->e.c->contents.number > 0)
     {
diff --git a/tp/Texinfo/XS/main/convert_to_texinfo.c 
b/tp/Texinfo/XS/main/convert_to_texinfo.c
index 61df92efa9..e1efd3bf19 100644
--- a/tp/Texinfo/XS/main/convert_to_texinfo.c
+++ b/tp/Texinfo/XS/main/convert_to_texinfo.c
@@ -373,9 +373,9 @@ root_heading_command_to_texinfo (const ELEMENT *element)
     {
       if ((data_cmd == CM_node
            || (builtin_command_data[data_cmd].flags & CF_sectioning_heading))
-          && element->e.c->args.number > 0
-          && element->e.c->args.list[0]->e.c->contents.number > 0)
-        tree = element->e.c->args.list[0];
+          && element->e.c->contents.list[0]->e.c->contents.list[0]
+                                              ->e.c->contents.number > 0)
+        tree = element->e.c->contents.list[0]->e.c->contents.list[0];
     }
   else
     return strdup ("Not a command");
diff --git a/tp/Texinfo/XS/main/convert_to_text.c 
b/tp/Texinfo/XS/main/convert_to_text.c
index a5a6590c8d..152fce9a57 100644
--- a/tp/Texinfo/XS/main/convert_to_text.c
+++ b/tp/Texinfo/XS/main/convert_to_text.c
@@ -950,6 +950,29 @@ convert_to_text_internal (const ELEMENT *element, 
TEXT_OPTIONS *text_options,
                 }
             }
         }
+      else if (builtin_command_data[data_cmd].flags & CF_sectioning_heading)
+        {
+          const ELEMENT *line_arg;
+          TEXT text;
+          char *heading;
+
+          text_init (&text);
+          text_append (&text, "");
+
+          if (builtin_command_data[data_cmd].flags & CF_root)
+            line_arg = element->e.c->contents.list[0]->e.c->contents.list[0];
+          else
+            line_arg = element->e.c->args.list[0];
+
+          convert_to_text_internal (line_arg, text_options, &text);
+          heading
+             = text_heading (element, text.text,
+                                    text_options->other_converter_options,
+                                    text_options->NUMBER_SECTIONS, 0);
+          ADD(heading);
+          free (heading);
+          free (text.text);
+        }
       else if (builtin_command_data[data_cmd].other_flags & CF_formatted_line)
         {
           if (data_cmd != CM_node)
@@ -960,21 +983,9 @@ convert_to_text_internal (const ELEMENT *element, 
TEXT_OPTIONS *text_options,
               if (data_cmd != CM_page)
                 convert_to_text_internal (element->e.c->args.list[0],
                                           text_options, &text);
-              if (builtin_command_data[data_cmd].flags & CF_sectioning_heading)
-                {
-                  char *heading
-                    = text_heading (element, text.text,
-                                    text_options->other_converter_options,
-                                    text_options->NUMBER_SECTIONS, 0);
-                  ADD(heading);
-                  free (heading);
-                }
-              else
-                {
-                  if (!(text.end > 0 && text.text[text.end - 1] == '\n'))
-                    text_append (&text, "\n");
-                  ADD(text.text);
-                }
+              if (!(text.end > 0 && text.text[text.end - 1] == '\n'))
+                text_append (&text, "\n");
+              ADD(text.text);
               free (text.text);
             }
         }
diff --git a/tp/Texinfo/XS/main/node_name_normalization.c 
b/tp/Texinfo/XS/main/node_name_normalization.c
index 6d10511962..ede8515429 100644
--- a/tp/Texinfo/XS/main/node_name_normalization.c
+++ b/tp/Texinfo/XS/main/node_name_normalization.c
@@ -77,7 +77,11 @@ convert_to_normalized_internal (const ELEMENT *e, TEXT 
*result)
              /* here ignore the line commands */
               || (e->e.c->args.number > 0
                   && (e->e.c->args.list[0]->type == ET_line_arg
-                      || e->e.c->args.list[0]->type == ET_rawline_arg)))))
+                      || e->e.c->args.list[0]->type == ET_rawline_arg))
+              || (e->e.c->contents.number > 0
+                  && e->e.c->contents.list[0]->e.c->contents.number > 0
+                  && e->e.c->contents.list[0]->e.c->contents.list[0]->type
+                                                   == ET_line_arg))))
     return;
 
   if (e->e.c->cmd)
diff --git a/tp/Texinfo/XS/main/utils.c b/tp/Texinfo/XS/main/utils.c
index e37ef7e587..234f4e7fa6 100644
--- a/tp/Texinfo/XS/main/utils.c
+++ b/tp/Texinfo/XS/main/utils.c
@@ -654,12 +654,12 @@ item_line_parent (ELEMENT *current)
 ELEMENT *
 get_label_element (const ELEMENT *e)
 {
-  if (e->e.c->cmd == CM_node && e->e.c->args.number > 0)
-    return e->e.c->args.list[0];
+  if (e->e.c->cmd == CM_node)
+    return e->e.c->contents.list[0]->e.c->contents.list[0];
   else if (e->e.c->cmd == CM_anchor && e->e.c->contents.number > 0)
     return e->e.c->contents.list[0];
-  else if (e->e.c->cmd == CM_float && e->e.c->contents.number
-           && e->e.c->contents.list[0]->e.c->contents.number >= 2 )
+  else if (e->e.c->cmd == CM_float
+           && e->e.c->contents.list[0]->e.c->contents.number >= 2)
     return e->e.c->contents.list[0]->e.c->contents.list[1];
   return 0;
 }
@@ -1614,6 +1614,9 @@ is_content_empty (const ELEMENT *tree, int 
do_not_ignore_index_entries)
             }
         }
 
+      if (content->type == ET_argument)
+        continue;
+
       data_cmd = element_builtin_data_cmd (content);
       if (data_cmd)
         {
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c 
b/tp/Texinfo/XS/parsetexi/end_line.c
index ba423f337e..50c2c78901 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -111,30 +111,36 @@ parse_line_command_args (ELEMENT *line_command)
     add_string (string, line_args); \
 } while (0)
 
-  ELEMENT *arg = line_command->e.c->args.list[0];
+  ELEMENT *line_arg;
   STRING_LIST *line_args;
   enum command_id cmd;
   const char *line;
 
   cmd = line_command->e.c->cmd;
-  if (arg->e.c->contents.number == 0)
+
+  if (command_data(cmd).flags & CF_root)
+    line_arg = line_command->e.c->contents.list[0]->e.c->contents.list[0];
+  else
+    line_arg = line_command->e.c->args.list[0];
+
+  if (line_arg->e.c->contents.number == 0)
    {
      command_error (line_command, "@%s missing argument", command_name(cmd));
      return 0;
    }
 
-  if (arg->e.c->contents.number > 1
-      || arg->e.c->contents.list[0]->type != ET_normal_text)
+  if (line_arg->e.c->contents.number > 1
+      || line_arg->e.c->contents.list[0]->type != ET_normal_text)
     {
       line_error ("superfluous argument to @%s", command_name (cmd));
     }
-  if (arg->e.c->contents.list[0]->type != ET_normal_text
-      || arg->e.c->contents.list[0]->e.text->end == 0)
+  if (line_arg->e.c->contents.list[0]->type != ET_normal_text
+      || line_arg->e.c->contents.list[0]->e.text->end == 0)
     return 0;
 
   /* put in extra "misc_args" */
   line_args = new_string_list ();
-  line = arg->e.c->contents.list[0]->e.text->text;
+  line = line_arg->e.c->contents.list[0]->e.text->text;
 
   switch (cmd)
     {
@@ -1233,13 +1239,38 @@ end_line_misc_line (ELEMENT *current)
   enum command_id end_id = CM_NONE;
   int included_file = 0;
   SOURCE_MARK *include_source_mark = 0;
+  ELEMENT *command_element;
+  ELEMENT *line_arg = 0;
+
+  if (current->parent->type == ET_argument)
+    {
+      command_element = current->parent->parent;
+      line_arg = command_element->e.c->contents.list[0]->e.c->contents.list[0];
+    }
+  else
+    {
+      command_element = current->parent;
+      if (command_data(command_element->e.c->cmd).flags & CF_def)
+        line_arg = command_element->e.c->contents.list[0];
+      else
+        line_arg = command_element->e.c->args.list[0];
+    }
+
+  data_cmd = cmd = command_element->e.c->cmd;
 
-  data_cmd = cmd = current->parent->e.c->cmd;
   /* we are in a command line context, so the @item command information is
      associated to CM_item_LINE */
   if (cmd == CM_item)
     data_cmd = CM_item_LINE;
 
+  if (! line_arg)
+    {
+      if (command_data(data_cmd).flags & CF_def)
+        line_arg = command_element->e.c->contents.list[0];
+      else
+        line_arg = command_element->e.c->args.list[0];
+    }
+
   if (command_data(data_cmd).flags & CF_contain_basic_inline)
     (void) pop_command (&nesting_context.basic_inline_stack_on_line);
   isolate_last_space (current);
@@ -1247,7 +1278,7 @@ end_line_misc_line (ELEMENT *current)
   if (current->parent->flags & EF_def_line)
     return end_line_def_line (current);
 
-  current = current->parent;
+  current = command_element;
   misc_cmd = current;
 
   arg_spec = command_data(data_cmd).data;
@@ -1576,11 +1607,12 @@ end_line_misc_line (ELEMENT *current)
   else if (current->e.c->cmd == CM_node)
     {
       size_t i;
+      ELEMENT *argument = current->e.c->contents.list[0];
       ELEMENT *label_element;
 
-      for (i = 1; i < current->e.c->args.number && i < 4; i++)
+      for (i = 1; i < argument->e.c->contents.number && i < 4; i++)
         {
-          ELEMENT * arg = current->e.c->args.list[i];
+          ELEMENT * arg = argument->e.c->contents.list[i];
           NODE_SPEC_EXTRA *direction_label_info = parse_node_manual (arg, 1);
           if (direction_label_info->node_content)
             {
@@ -1604,7 +1636,7 @@ end_line_misc_line (ELEMENT *current)
         }
 
       /* Now take care of the node itself */
-      label_element = current->e.c->args.list[0];
+      label_element = argument->e.c->contents.list[0];
       if (label_element->e.c->contents.number == 0)
         {
           line_error_ext (MSG_error, 0, &current->e.c->source_info,
@@ -1639,7 +1671,7 @@ end_line_misc_line (ELEMENT *current)
         }
       /* All the other "line" commands. Check they have an argument. Empty
          @top is allowed. */
-      if (current->e.c->args.list[0]->e.c->contents.number == 0
+      if (line_arg->e.c->contents.number == 0
           && current->e.c->cmd != CM_top)
         {
           command_warn (current, "@%s missing argument",
diff --git a/tp/Texinfo/XS/parsetexi/handle_commands.c 
b/tp/Texinfo/XS/parsetexi/handle_commands.c
index 376e12a286..812251caaf 100644
--- a/tp/Texinfo/XS/parsetexi/handle_commands.c
+++ b/tp/Texinfo/XS/parsetexi/handle_commands.c
@@ -927,6 +927,12 @@ handle_line_command (ELEMENT *current, const char 
**line_inout,
       arg = new_element (ET_line_arg);
       if (command_data(data_cmd).flags & CF_def)
         add_to_element_contents (current, arg);
+      else if (command_data(data_cmd).flags & CF_root)
+        {
+          ELEMENT *argument = new_element (ET_argument);
+          add_to_element_contents (current, argument);
+          add_to_element_contents (argument, arg);
+        }
       else
         add_to_element_args (current, arg);
 
@@ -979,6 +985,11 @@ handle_line_command (ELEMENT *current, const char 
**line_inout,
 
       if (command_data(data_cmd).flags & CF_def)
         current = last_contents_child (current);
+      else if (command_data(data_cmd).flags & CF_root)
+        {
+          current = last_contents_child (current->e.c->contents.list[0]);
+          push_context (ct_line, cmd);
+        }
       else
         {
           current = last_args_child (current);
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index c19b083a5a..b9165fe529 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -1234,6 +1234,7 @@ void
 check_valid_nesting (ELEMENT *current, enum command_id cmd)
 {
   enum command_id invalid_parent = 0;
+  const ELEMENT *parent_command;
 
   /* Check whether outer command can contain cmd.  Commands are
      classified according to what commands they can contain:
@@ -1245,9 +1246,17 @@ check_valid_nesting (ELEMENT *current, enum command_id 
cmd)
 
   int ok = 0; /* Whether nesting is allowed. */
 
-  enum command_id outer = current->parent->e.c->cmd;
-  unsigned long outer_flags = command_data(outer).flags;
   unsigned long cmd_flags = command_data(cmd).flags;
+  enum command_id outer;
+  unsigned long outer_flags;
+
+  if (current->parent->type == ET_argument)
+    parent_command = current->parent->parent;
+  else
+    parent_command = current->parent;
+
+  outer = parent_command->e.c->cmd;
+  outer_flags = command_data(outer).flags;
 
   /* first three conditions check if in the main contents of the commands
      or in the arguments where there is checking of nesting */
@@ -1335,7 +1344,7 @@ check_valid_nesting (ELEMENT *current, enum command_id 
cmd)
 
   if (!ok)
     {
-      invalid_parent = current->parent->e.c->cmd;
+      invalid_parent = parent_command->e.c->cmd;
       if (!invalid_parent)
         {
           /* current_context () == ct_def.  Find def block containing
@@ -2523,7 +2532,15 @@ process_remaining_on_line (ELEMENT **current_inout, 
const char **line_inout)
                       &count_remaining_args, current->parent->parent) > 0))
         current = handle_comma (current, &line);
       else if (current->type == ET_line_arg
-               && current->parent->e.c->cmd == CM_node)
+              /* this avoids detecting the comma in @cindex as being on the
+                 node line in the following case:
+                 @node some node
+
+                 @cindex a, b
+               */
+               && !current->parent->e.c->cmd
+               && current->parent->parent
+               && current->parent->parent->e.c->cmd == CM_node)
         line_warn ("superfluous arguments for node");
       else
         current = merge_text (current, ",", 1, 0);
diff --git a/tp/Texinfo/XS/structuring_transfo/structuring.c 
b/tp/Texinfo/XS/structuring_transfo/structuring.c
index a459f2a0b6..21f9341af4 100644
--- a/tp/Texinfo/XS/structuring_transfo/structuring.c
+++ b/tp/Texinfo/XS/structuring_transfo/structuring.c
@@ -53,6 +53,7 @@ void
 new_block_command (ELEMENT *element)
 {
   ELEMENT *args = new_element (ET_block_line_arg);
+  ELEMENT *argument = new_element (ET_argument);
   ELEMENT *arg_spaces_after = new_text_element (ET_other_text);
   ELEMENT *end = new_command_element (ET_line_command, CM_end);
   ELEMENT *end_args = new_element (ET_line_arg);
@@ -63,7 +64,9 @@ new_block_command (ELEMENT *element)
 
   text_append (arg_spaces_after->e.text, "\n");
   args->elt_info[eit_spaces_after_argument] = arg_spaces_after;
-  add_to_element_args (element, args);
+  add_to_element_contents (argument, args);
+
+  insert_into_contents (element, argument, 0);
 
   add_extra_string_dup (end, AI_key_text_arg, command_name);
   text_append (end_spaces_before->e.text, " ");
@@ -672,7 +675,8 @@ check_nodes_are_referenced (DOCUMENT *document)
          the nodes appearing in the automatic menu are referenced.
          Note that the menu may not be actually setup, but
          it is better not to warn for nothing. */
-          int automatic_directions = (node->e.c->args.number <= 1);
+          const ELEMENT *argument = node->e.c->contents.list[0];
+          int automatic_directions = (argument->e.c->contents.number <= 1);
           if (automatic_directions)
             {
               CONST_ELEMENT_LIST *node_childs
@@ -1040,7 +1044,8 @@ complete_node_tree_with_menus (DOCUMENT *document)
       const char *normalized = lookup_extra_string (node, AI_key_normalized);
       const ELEMENT * const *menu_directions = lookup_extra_directions (node,
                                                  AI_key_menu_directions);
-      int automatic_directions = (node->e.c->args.number <= 1);
+      const ELEMENT *argument = node->e.c->contents.list[0];
+      int automatic_directions = (argument->e.c->contents.number <= 1);
 
       if (automatic_directions)
         {
@@ -1334,6 +1339,7 @@ nodes_tree (DOCUMENT *document)
   for (i = 0; i < root->e.c->contents.number; i++)
     {
       ELEMENT *node = root->e.c->contents.list[i];
+      ELEMENT *argument;
       const char *normalized;
       int is_target;
       int automatic_directions;
@@ -1352,7 +1358,8 @@ nodes_tree (DOCUMENT *document)
       if (is_target && !strcmp (normalized, "Top"))
         top_node = node;
 
-      automatic_directions = (node->e.c->args.number <= 1);
+      argument = node->e.c->contents.list[0];
+      automatic_directions = (argument->e.c->contents.number <= 1);
 
       if (automatic_directions)
         if (!top_node || node != top_node)
@@ -1421,9 +1428,10 @@ nodes_tree (DOCUMENT *document)
       else /* explicit directions */
         {
           size_t i;
-          for (i = 1; i < node->e.c->args.number; i++)
+          for (i = 1; i < argument->e.c->contents.number; i++)
             {
-              const ELEMENT *direction_element = node->e.c->args.list[i];
+              const ELEMENT *direction_element
+                = argument->e.c->contents.list[i];
               int direction = (int) i - 1;
               const ELEMENT *manual_content
                             = lookup_extra_container (direction_element,
@@ -1695,7 +1703,7 @@ new_node_menu_entry (const ELEMENT *node, int 
use_sections)
   size_t i;
   int is_target = (node->flags & EF_is_target);
   if (is_target)
-    node_name_element = node->e.c->args.list[0];
+    node_name_element = node->e.c->contents.list[0]->e.c->contents.list[0];
 
   if (!node_name_element)
     return 0;
@@ -1707,7 +1715,8 @@ new_node_menu_entry (const ELEMENT *node, int 
use_sections)
       const ELEMENT *associated_section
         = lookup_extra_element (node, AI_key_associated_section);
       if (associated_section)
-        name_element = associated_section->e.c->args.list[0];
+        name_element = associated_section->e.c->contents.list[0]
+                                             ->e.c->contents.list[0];
       else
         name_element = node_name_element; /* shouldn't happen */
 
@@ -1891,12 +1900,13 @@ new_complete_node_menu (const ELEMENT *node, DOCUMENT 
*document,
                   const ELEMENT *associated_part
                     = lookup_extra_element (child_section,
                                             AI_key_associated_part);
-                  if (associated_part
-                      && associated_part->e.c->args.number > 0)
+                  if (associated_part)
                     {
+                      const ELEMENT *part_line_arg
+                        = associated_part->e.c->contents.list[0]
+                                             ->e.c->contents.list[0];
                       ELEMENT *part_title_copy
-                       = copy_contents (associated_part->e.c->args.list[0],
-                                        ET_NONE);
+                       = copy_contents (part_line_arg, ET_NONE);
                       NAMED_STRING_ELEMENT_LIST *substrings
                                        = new_named_string_element_list ();
                       ELEMENT *part_title;
@@ -2014,9 +2024,11 @@ print_down_menus (const ELEMENT *node, ELEMENT_STACK 
*up_nodes,
        = lookup_extra_element (node, AI_key_associated_section);
       int new_up_nodes = 0;
       if (associated_section)
-        node_name_element = associated_section->e.c->args.list[0];
+        node_name_element = associated_section->e.c->contents.list[0]
+                                                   ->e.c->contents.list[0];
       else
-        node_name_element = node->e.c->args.list[0];
+        node_name_element = node->e.c->contents.list[0]
+                                                ->e.c->contents.list[0];
 
       node_title_copy = copy_contents (node_name_element, ET_NONE);
 
diff --git a/tp/Texinfo/XS/structuring_transfo/transformations.c 
b/tp/Texinfo/XS/structuring_transfo/transformations.c
index 18cb741731..9d4dbf37bc 100644
--- a/tp/Texinfo/XS/structuring_transfo/transformations.c
+++ b/tp/Texinfo/XS/structuring_transfo/transformations.c
@@ -249,6 +249,7 @@ fill_gaps_in_sectioning (ELEMENT *root, ELEMENT 
*commands_heading_content)
               ELEMENT *spaces_before_argument
                  = new_text_element (ET_other_text);
               ELEMENT *line_arg = new_element (ET_line_arg);
+              ELEMENT *argument = new_element (ET_argument);
               ELEMENT *spaces_after_argument = new_text_element 
(ET_other_text);
               ELEMENT *empty_line = new_text_element (ET_empty_line);
 
@@ -256,15 +257,16 @@ fill_gaps_in_sectioning (ELEMENT *root, ELEMENT 
*commands_heading_content)
               new_section = new_command_element (ET_line_command,
           level_to_structuring_command[CM_unnumbered][current_section_level]);
 
-
               text_append (spaces_before_argument->e.text, " ");
               new_section->elt_info[eit_spaces_before_argument]
                              = spaces_before_argument;
               text_append (spaces_after_argument->e.text, "\n");
 
+              add_to_element_contents (new_section, argument);
+
               line_arg->elt_info[eit_spaces_after_argument]
                        = spaces_after_argument;
-              add_to_element_args (new_section, line_arg);
+              add_to_element_contents (argument, line_arg);
 
               if (commands_heading_content)
                 {
@@ -644,12 +646,14 @@ new_node (ERROR_MESSAGE_LIST *error_messages, ELEMENT 
*node_tree,
       char *non_hyphen_char;
       ELEMENT *target = 0;
       ELEMENT *appended_text = 0;
+      ELEMENT *argument = new_element (ET_argument);
       ELEMENT *node_line_arg = new_element (ET_line_arg);
       ELEMENT *spaces_before = new_text_element (ET_other_text);
       ELEMENT *spaces_after = new_text_element (ET_other_text);
 
       node = new_command_element (ET_line_command, CM_node);
-      add_to_element_args (node, node_line_arg);
+      add_to_element_contents (node, argument);
+      add_to_element_contents (argument, node_line_arg);
       text_append (spaces_before->e.text, " ");
       text_append (spaces_after->e.text, spaces_after_argument.text);
       node->elt_info[eit_spaces_before_argument] = spaces_before;
@@ -824,8 +828,9 @@ insert_nodes_for_sectioning_commands (DOCUMENT *document)
                 }
               else
                 {
-                  new_node_tree = copy_contents (content->e.c->args.list[0],
-                                                 ET_NONE);
+                  const ELEMENT *line_arg
+                    = content->e.c->contents.list[0]->e.c->contents.list[0];
+                  new_node_tree = copy_contents (line_arg, ET_NONE);
                 }
               added_node = new_node (&document->error_messages, new_node_tree,
                                      document);
@@ -1113,7 +1118,7 @@ get_non_automatic_nodes_with_sections (const ELEMENT 
*root)
     {
       ELEMENT *content = root->e.c->contents.list[i];
       if (content->e.c->cmd && content->e.c->cmd == CM_node
-          && content->e.c->args.number <= 1)
+          && content->e.c->contents.list[0]->e.c->contents.number <= 1)
         {
           const ELEMENT *associated_section
             = lookup_extra_element (content, AI_key_associated_section);
diff --git a/tp/ext/epub3.pm b/tp/ext/epub3.pm
index 966a3b5992..ead002aab5 100644
--- a/tp/ext/epub3.pm
+++ b/tp/ext/epub3.pm
@@ -758,7 +758,8 @@ EOT
       } else {
         print $nav_fh "</li>\n";
       }
-      my $text = _epub_convert_tree_to_text($self, $section->{'args'}->[0]);
+      my $line_arg = $section->{'contents'}->[0]->{'contents'}->[0];
+      my $text = _epub_convert_tree_to_text($self, $line_arg);
       $text
         = Texinfo::Convert::Utils::add_heading_number($self, $section, $text,
                                           $self->get_conf('NUMBER_SECTIONS'));
diff --git a/tp/init/chm.pm b/tp/init/chm.pm
index 17faceb98a..c51ff00a08 100644
--- a/tp/init/chm.pm
+++ b/tp/init/chm.pm
@@ -350,7 +350,8 @@ sub chm_init($)
           $level--;
         }
       }
-      my $text = _chm_convert_tree_to_text($self, $section->{'args'}->[0]);
+      my $line_arg = $section->{'contents'}->[0]->{'contents'}->[0];
+      my $text = _chm_convert_tree_to_text($self, $line_arg);
       # should not be needed as end of lines are not converted, end of line
       # can be added with invalid nestings.
       chomp($text);
diff --git a/tp/t/results/alias/alias_of_added_index.pl 
b/tp/t/results/alias/alias_of_added_index.pl
index e6957aa13c..cd8fbdb0e2 100644
--- a/tp/t/results/alias/alias_of_added_index.pl
+++ b/tp/t/results/alias/alias_of_added_index.pl
@@ -88,23 +88,28 @@ $result_trees{'alias_of_added_index'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -119,24 +124,27 @@ $result_trees{'alias_of_added_index'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -196,23 +204,28 @@ $result_trees{'alias_of_added_index'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -228,24 +241,27 @@ $result_trees{'alias_of_added_index'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -299,7 +315,7 @@ $result_trees{'alias_of_added_index'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'alias_of_added_index'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'alias_of_added_index'}{'contents'}[1];
+$result_trees{'alias_of_added_index'}{'contents'}[2]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'alias_of_added_index'}{'contents'}[1];
 
 $result_texis{'alias_of_added_index'} = '@defindex sli
 
diff --git a/tp/t/results/alias/alias_of_added_index_before_added_index.pl 
b/tp/t/results/alias/alias_of_added_index_before_added_index.pl
index f82b89d22e..b924f74fb8 100644
--- a/tp/t/results/alias/alias_of_added_index_before_added_index.pl
+++ b/tp/t/results/alias/alias_of_added_index_before_added_index.pl
@@ -88,23 +88,28 @@ $result_trees{'alias_of_added_index_before_added_index'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -119,24 +124,27 @@ $result_trees{'alias_of_added_index_before_added_index'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -196,23 +204,28 @@ $result_trees{'alias_of_added_index_before_added_index'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -228,24 +241,27 @@ $result_trees{'alias_of_added_index_before_added_index'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -299,7 +315,7 @@ $result_trees{'alias_of_added_index_before_added_index'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'alias_of_added_index_before_added_index'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'alias_of_added_index_before_added_index'}{'contents'}[1];
+$result_trees{'alias_of_added_index_before_added_index'}{'contents'}[2]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'alias_of_added_index_before_added_index'}{'contents'}[1];
 
 $result_texis{'alias_of_added_index_before_added_index'} = '@alias new = 
sliindex
 
diff --git a/tp/t/results/conditionals/cond.pl 
b/tp/t/results/conditionals/cond.pl
index a70a45af64..d50124267f 100644
--- a/tp/t/results/conditionals/cond.pl
+++ b/tp/t/results/conditionals/cond.pl
@@ -272,23 +272,28 @@ $result_trees{'cond'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -304,24 +309,27 @@ $result_trees{'cond'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'conditionals'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'conditionals'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -340,24 +348,27 @@ $result_trees{'cond'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl 
b/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl
index 13d3819a75..520e3a3821 100644
--- a/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl
+++ b/tp/t/results/conditionals/cond_ifhtml_ifinfo.pl
@@ -271,23 +271,28 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -303,24 +308,27 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'conditionals'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'conditionals'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -339,24 +347,27 @@ $result_trees{'cond_ifhtml_ifinfo'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/conditionals/cond_ifhtml_ifinfo_iftex.pl 
b/tp/t/results/conditionals/cond_ifhtml_ifinfo_iftex.pl
index 5cbc0112e3..f1f4680c82 100644
--- a/tp/t/results/conditionals/cond_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/conditionals/cond_ifhtml_ifinfo_iftex.pl
@@ -271,23 +271,28 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -303,24 +308,27 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'conditionals'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'conditionals'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -339,24 +347,27 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/conditionals/cond_info.pl 
b/tp/t/results/conditionals/cond_info.pl
index e358f1e481..1075148dc5 100644
--- a/tp/t/results/conditionals/cond_info.pl
+++ b/tp/t/results/conditionals/cond_info.pl
@@ -272,23 +272,28 @@ $result_trees{'cond_info'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -304,24 +309,27 @@ $result_trees{'cond_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'conditionals'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'conditionals'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -340,24 +348,27 @@ $result_trees{'cond_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 70f79962d1..e4952edf86 100644
--- a/tp/t/results/conditionals/cond_info_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/conditionals/cond_info_ifhtml_ifinfo_iftex.pl
@@ -271,23 +271,28 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -303,24 +308,27 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'conditionals'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'conditionals'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -339,24 +347,27 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 46b4b23af8..cb62f2e18a 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
@@ -272,23 +272,28 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = 
{
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -304,24 +309,27 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'conditionals'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'conditionals'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -340,24 +348,27 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 11c73ee36e..dc35051df8 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
@@ -272,23 +272,28 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -304,24 +309,27 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'conditionals'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'conditionals'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -340,24 +348,27 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/conditionals/cond_xml.pl 
b/tp/t/results/conditionals/cond_xml.pl
index 1d7c268010..876bfa7ac1 100644
--- a/tp/t/results/conditionals/cond_xml.pl
+++ b/tp/t/results/conditionals/cond_xml.pl
@@ -272,23 +272,28 @@ $result_trees{'cond_xml'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -304,24 +309,27 @@ $result_trees{'cond_xml'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'conditionals'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'conditionals'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -340,24 +348,27 @@ $result_trees{'cond_xml'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/conditionals/defcondx_Dbar.pl 
b/tp/t/results/conditionals/defcondx_Dbar.pl
index 185df86df3..adcb3e59a7 100644
--- a/tp/t/results/conditionals/defcondx_Dbar.pl
+++ b/tp/t/results/conditionals/defcondx_Dbar.pl
@@ -73,24 +73,27 @@ $result_trees{'defcondx_Dbar'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'deffnx inside conditional'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'deffnx inside conditional'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/conditionals/defcondx_Ubar.pl 
b/tp/t/results/conditionals/defcondx_Ubar.pl
index 4aea091340..c0555a6a5f 100644
--- a/tp/t/results/conditionals/defcondx_Ubar.pl
+++ b/tp/t/results/conditionals/defcondx_Ubar.pl
@@ -73,24 +73,27 @@ $result_trees{'defcondx_Ubar'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'deffnx inside conditional'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'deffnx inside conditional'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 50bdc50c96..adfd128245 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -11,23 +11,28 @@ $result_trees{'at_commands_in_raw'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'at_commands_in_raw'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -138,23 +146,28 @@ $result_trees{'at_commands_in_raw'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -170,24 +183,27 @@ $result_trees{'at_commands_in_raw'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1061,9 +1077,9 @@ $result_trees{'at_commands_in_raw'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'at_commands_in_raw'}{'contents'}[3];
+$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[16]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'at_commands_in_raw'}{'contents'}[3];
 
 $result_texis{'at_commands_in_raw'} = '@node Top
 @top top
diff --git a/tp/t/results/converters_tests/combined_fonts.pl 
b/tp/t/results/converters_tests/combined_fonts.pl
index bf0fca5d16..7113363cd4 100644
--- a/tp/t/results/converters_tests/combined_fonts.pl
+++ b/tp/t/results/converters_tests/combined_fonts.pl
@@ -53,23 +53,28 @@ $result_trees{'combined_fonts'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -84,24 +89,27 @@ $result_trees{'combined_fonts'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -119,23 +127,28 @@ $result_trees{'combined_fonts'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -150,24 +163,27 @@ $result_trees{'combined_fonts'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/converters_tests/commands_in_sc.pl 
b/tp/t/results/converters_tests/commands_in_sc.pl
index ab22aa940d..0334047c6b 100644
--- a/tp/t/results/converters_tests/commands_in_sc.pl
+++ b/tp/t/results/converters_tests/commands_in_sc.pl
@@ -11,23 +11,28 @@ $result_trees{'commands_in_sc'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'commands_in_sc'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'commands in sc'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'commands in sc'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -77,23 +85,28 @@ $result_trees{'commands_in_sc'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -108,24 +121,27 @@ $result_trees{'commands_in_sc'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -682,10 +698,10 @@ $result_trees{'commands_in_sc'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0];
-$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'contents'}[1];
-$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'contents'}[3];
-$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[13]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[13]{'contents'}[0]{'contents'}[0];
+$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0];
+$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'contents'}[1];
+$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'contents'}[3];
+$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[13]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[13]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'commands_in_sc'} = '@node Top
 @top commands in sc
diff --git a/tp/t/results/converters_tests/commands_in_settitle_with_title.pl 
b/tp/t/results/converters_tests/commands_in_settitle_with_title.pl
index 21b4aae62c..077651fe2b 100644
--- a/tp/t/results/converters_tests/commands_in_settitle_with_title.pl
+++ b/tp/t/results/converters_tests/commands_in_settitle_with_title.pl
@@ -245,23 +245,28 @@ $result_trees{'commands_in_settitle_with_title'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -276,24 +281,27 @@ $result_trees{'commands_in_settitle_with_title'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -311,23 +319,28 @@ $result_trees{'commands_in_settitle_with_title'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -342,24 +355,27 @@ $result_trees{'commands_in_settitle_with_title'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/converters_tests/commands_in_var.pl 
b/tp/t/results/converters_tests/commands_in_var.pl
index 31c9b28f20..98c0bc8605 100644
--- a/tp/t/results/converters_tests/commands_in_var.pl
+++ b/tp/t/results/converters_tests/commands_in_var.pl
@@ -11,23 +11,28 @@ $result_trees{'commands_in_var'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'commands_in_var'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'commands in var'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'commands in var'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -77,23 +85,28 @@ $result_trees{'commands_in_var'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -108,24 +121,27 @@ $result_trees{'commands_in_var'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -682,10 +698,10 @@ $result_trees{'commands_in_var'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0];
-$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'contents'}[1];
-$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'contents'}[3];
-$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[13]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[13]{'contents'}[0]{'contents'}[0];
+$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0];
+$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'contents'}[1];
+$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'contents'}[3];
+$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[13]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[13]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'commands_in_var'} = '@node Top
 @top commands in var
diff --git a/tp/t/results/converters_tests/complex_nestings.pl 
b/tp/t/results/converters_tests/complex_nestings.pl
index 5f7209f844..01f7284279 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -11,23 +11,28 @@ $result_trees{'complex_nestings'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'complex_nestings'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -77,23 +85,28 @@ $result_trees{'complex_nestings'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -108,24 +121,27 @@ $result_trees{'complex_nestings'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1189,12 +1205,12 @@ $result_trees{'complex_nestings'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'complex_nestings'}{'contents'}[3];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'complex_nestings'}{'contents'}[3];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'complex_nestings'}{'contents'}[3];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'complex_nestings'}{'contents'}[3];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'complex_nestings'}{'contents'}[3];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'complex_nestings'}{'contents'}[3];
+$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'complex_nestings'}{'contents'}[3];
+$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'complex_nestings'}{'contents'}[3];
+$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'complex_nestings'}{'contents'}[3];
+$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'complex_nestings'}{'contents'}[3];
+$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'complex_nestings'} = '@node Top
 @top top
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 b17220ddb2..f9ba2b04e1 100644
--- a/tp/t/results/converters_tests/contents_at_document_begin.pl
+++ b/tp/t/results/converters_tests/contents_at_document_begin.pl
@@ -53,23 +53,28 @@ $result_trees{'contents_at_document_begin'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -85,24 +90,27 @@ $result_trees{'contents_at_document_begin'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Contents at beginning'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Contents at beginning'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -241,23 +249,28 @@ $result_trees{'contents_at_document_begin'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -273,24 +286,27 @@ $result_trees{'contents_at_document_begin'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -337,7 +353,7 @@ $result_trees{'contents_at_document_begin'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_at_document_begin'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_at_document_begin'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_at_document_begin'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_at_document_begin'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'contents_at_document_begin'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/converters_tests/contents_at_document_begin_inline.pl 
b/tp/t/results/converters_tests/contents_at_document_begin_inline.pl
index 4e41dbeb86..a1193755c4 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
@@ -53,23 +53,28 @@ $result_trees{'contents_at_document_begin_inline'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -85,24 +90,27 @@ $result_trees{'contents_at_document_begin_inline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Contents at beginning'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Contents at beginning'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -241,23 +249,28 @@ $result_trees{'contents_at_document_begin_inline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -273,24 +286,27 @@ $result_trees{'contents_at_document_begin_inline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -337,7 +353,7 @@ $result_trees{'contents_at_document_begin_inline'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_at_document_begin_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_at_document_begin_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_at_document_begin_inline'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_at_document_begin_inline'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'contents_at_document_begin_inline'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git 
a/tp/t/results/converters_tests/contents_at_document_begin_separate_element.pl 
b/tp/t/results/converters_tests/contents_at_document_begin_separate_element.pl
index 3fc4a29e2d..f95871fe3d 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
@@ -53,23 +53,28 @@ 
$result_trees{'contents_at_document_begin_separate_element'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -85,24 +90,27 @@ 
$result_trees{'contents_at_document_begin_separate_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Contents at beginning'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Contents at beginning'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -241,23 +249,28 @@ 
$result_trees{'contents_at_document_begin_separate_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -273,24 +286,27 @@ 
$result_trees{'contents_at_document_begin_separate_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -337,7 +353,7 @@ 
$result_trees{'contents_at_document_begin_separate_element'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_at_document_begin_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_at_document_begin_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_at_document_begin_separate_element'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_at_document_begin_separate_element'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'contents_at_document_begin_separate_element'} = '\\input 
texinfo @c -*-texinfo-*-
 
diff --git 
a/tp/t/results/converters_tests/conversion_with_undef_customization.pl 
b/tp/t/results/converters_tests/conversion_with_undef_customization.pl
index 9a9828e9fd..d5101f60e3 100644
--- a/tp/t/results/converters_tests/conversion_with_undef_customization.pl
+++ b/tp/t/results/converters_tests/conversion_with_undef_customization.pl
@@ -16,23 +16,28 @@ $result_trees{'conversion_with_undef_customization'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'conversion_with_undef_customization'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -115,39 +123,44 @@ $result_trees{'conversion_with_undef_customization'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            },
-            {
-              'cmdname' => '^',
               'contents' => [
                 {
+                  'text' => 'chap'
+                },
+                {
+                  'cmdname' => '^',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'following_arg'
                     }
                   ],
-                  'type' => 'following_arg'
+                  'source_info' => {
+                    'line_nr' => 7
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 7
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap_00ea'
@@ -162,40 +175,43 @@ $result_trees{'conversion_with_undef_customization'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            },
-            {
-              'cmdname' => '^',
               'contents' => [
                 {
+                  'text' => 'Chap'
+                },
+                {
+                  'cmdname' => '^',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'following_arg'
                     }
                   ],
-                  'type' => 'following_arg'
+                  'source_info' => {
+                    'line_nr' => 8
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 8
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -311,23 +327,28 @@ $result_trees{'conversion_with_undef_customization'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -343,24 +364,27 @@ $result_trees{'conversion_with_undef_customization'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -614,8 +638,8 @@ $result_trees{'conversion_with_undef_customization'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'conversion_with_undef_customization'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'conversion_with_undef_customization'}{'contents'}[3];
-$result_trees{'conversion_with_undef_customization'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'conversion_with_undef_customization'}{'contents'}[5];
+$result_trees{'conversion_with_undef_customization'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'conversion_with_undef_customization'}{'contents'}[3];
+$result_trees{'conversion_with_undef_customization'}{'contents'}[6]{'contents'}[4]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'conversion_with_undef_customization'}{'contents'}[5];
 
 $result_texis{'conversion_with_undef_customization'} = '@node Top
 @top top
diff --git a/tp/t/results/converters_tests/definition_commands.pl 
b/tp/t/results/converters_tests/definition_commands.pl
index 5fb10a0960..03328ca5a0 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -16,23 +16,28 @@ $result_trees{'definition_commands'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'definition_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'definition_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -113,24 +126,27 @@ $result_trees{'definition_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -20042,84 +20058,84 @@ $result_trees{'definition_commands'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'contents'}[14]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'contents'}[14]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[12]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[12]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[12]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[12]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[12]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[14]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[14]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[16]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[18]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[27]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[31]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[33]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'contents'}[14]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'contents'}[14]{'extra'}{'element_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
 $result_texis{'definition_commands'} = '@node Top
 @top top section
diff --git a/tp/t/results/converters_tests/extension_undef.pl 
b/tp/t/results/converters_tests/extension_undef.pl
index 47c811fcf7..3ef7704bc4 100644
--- a/tp/t/results/converters_tests/extension_undef.pl
+++ b/tp/t/results/converters_tests/extension_undef.pl
@@ -25,24 +25,27 @@ $result_trees{'extension_undef'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -60,23 +63,28 @@ $result_trees{'extension_undef'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -91,23 +99,28 @@ $result_trees{'extension_undef'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
diff --git a/tp/t/results/converters_tests/footnote_no_number.pl 
b/tp/t/results/converters_tests/footnote_no_number.pl
index f746b4840c..91f4c2f86d 100644
--- a/tp/t/results/converters_tests/footnote_no_number.pl
+++ b/tp/t/results/converters_tests/footnote_no_number.pl
@@ -11,23 +11,28 @@ $result_trees{'footnote_no_number'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'footnote_no_number'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -77,23 +85,28 @@ $result_trees{'footnote_no_number'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -108,24 +121,27 @@ $result_trees{'footnote_no_number'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 049df1dc63..eb7143ca21 100644
--- a/tp/t/results/converters_tests/footnote_no_number_separate.pl
+++ b/tp/t/results/converters_tests/footnote_no_number_separate.pl
@@ -11,23 +11,28 @@ $result_trees{'footnote_no_number_separate'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'footnote_no_number_separate'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -77,23 +85,28 @@ $result_trees{'footnote_no_number_separate'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -108,24 +121,27 @@ $result_trees{'footnote_no_number_separate'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/converters_tests/form_feeds.pl 
b/tp/t/results/converters_tests/form_feeds.pl
index 6462438a9a..4454768c34 100644
--- a/tp/t/results/converters_tests/form_feeds.pl
+++ b/tp/t/results/converters_tests/form_feeds.pl
@@ -11,24 +11,27 @@ $result_trees{'form_feeds'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -49,24 +52,27 @@ $result_trees{'form_feeds'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapnode'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapnode'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1355,13 +1361,13 @@ $result_trees{'form_feeds'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'form_feeds'}{'contents'}[2];
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'form_feeds'}{'contents'}[2];
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'float'}
 = $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[33];
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[33]{'contents'}[5]{'extra'}{'float'}
 = $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[33];
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[33]{'extra'}{'caption'} 
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[33]{'contents'}[2];
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[33]{'extra'}{'shortcaption'}
 = $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[33]{'contents'}[5];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[32]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'form_feeds'}{'contents'}[2];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[32]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'form_feeds'}{'contents'}[2];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[34]{'contents'}[2]{'extra'}{'float'}
 = $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[34];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[34]{'contents'}[5]{'extra'}{'float'}
 = $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[34];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[34]{'extra'}{'caption'} 
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[34]{'contents'}[2];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[34]{'extra'}{'shortcaption'}
 = $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[34]{'contents'}[5];
 
 $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 6982f9521a..0580c95700 100644
--- a/tp/t/results/converters_tests/frenchspacing_and_code.pl
+++ b/tp/t/results/converters_tests/frenchspacing_and_code.pl
@@ -55,23 +55,28 @@ $result_trees{'frenchspacing_and_code'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -86,24 +91,27 @@ $result_trees{'frenchspacing_and_code'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -121,23 +129,28 @@ $result_trees{'frenchspacing_and_code'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter frenchspacing'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter frenchspacing'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-frenchspacing'
@@ -152,24 +165,27 @@ $result_trees{'frenchspacing_and_code'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap frenchspacing'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap frenchspacing'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -997,23 +1013,28 @@ $result_trees{'frenchspacing_and_code'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap no'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap no'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap-no'
@@ -1028,24 +1049,27 @@ $result_trees{'frenchspacing_and_code'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap no'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap no'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1838,10 +1862,10 @@ $result_trees{'frenchspacing_and_code'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[3];
-$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'}[6]{'contents'}[7]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[5];
-$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[5];
+$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[8]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[3];
+$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[3];
+$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[8]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[5];
+$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[10]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[5];
 
 $result_texis{'frenchspacing_and_code'} = '
 @frenchspacing on
diff --git a/tp/t/results/converters_tests/image_formatting.pl 
b/tp/t/results/converters_tests/image_formatting.pl
index 078b8e42c1..3090523eaa 100644
--- a/tp/t/results/converters_tests/image_formatting.pl
+++ b/tp/t/results/converters_tests/image_formatting.pl
@@ -11,23 +11,28 @@ $result_trees{'image_formatting'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'image_formatting'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -77,23 +85,28 @@ $result_trees{'image_formatting'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -108,24 +121,27 @@ $result_trees{'image_formatting'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 ddfd22225e..3bd883c3d5 100644
--- a/tp/t/results/converters_tests/index_entry_in_preformatted.pl
+++ b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
@@ -11,23 +11,28 @@ $result_trees{'index_entry_in_preformatted'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'index_entry_in_preformatted'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -77,23 +85,28 @@ $result_trees{'index_entry_in_preformatted'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -108,24 +121,27 @@ $result_trees{'index_entry_in_preformatted'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -334,9 +350,9 @@ $result_trees{'index_entry_in_preformatted'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_entry_in_preformatted'}{'contents'}[3];
-$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_entry_in_preformatted'}{'contents'}[3];
-$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'index_entry_in_preformatted'}{'contents'}[3];
+$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_entry_in_preformatted'}{'contents'}[3];
+$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_entry_in_preformatted'}{'contents'}[3];
+$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'index_entry_in_preformatted'}{'contents'}[3];
 
 $result_texis{'index_entry_in_preformatted'} = '@node Top
 @top top
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 bb3c0cf02a..f89a54ce67 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
@@ -31,23 +31,28 @@ $result_trees{'indices_in_begin_tables_lists'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'indices_in_begin_tables_lists'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -99,23 +107,28 @@ $result_trees{'indices_in_begin_tables_lists'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -131,24 +144,27 @@ $result_trees{'indices_in_begin_tables_lists'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3644,23 +3660,28 @@ $result_trees{'indices_in_begin_tables_lists'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'printindex'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'printindex'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -3677,24 +3698,27 @@ $result_trees{'indices_in_begin_tables_lists'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'printindex'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'printindex'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3841,49 +3865,49 @@ $result_trees{'indices_in_begin_tables_lists'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'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]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[15]{'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'}[17]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[19]{'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'}[19]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[21]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[21]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[21]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[25]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[25]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[27]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[27]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[29]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[29]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[31]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[31]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[33]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[33]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[35]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[35]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[37]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[37]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[37]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'contents'}[1]{'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]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[6]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[10]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[12]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[14]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[16]{'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'}[18]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[18]{'contents'}[1]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[18]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[20]{'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'}[20]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[22]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[22]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[22]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[24]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[24]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[24]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[24]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[24]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[24]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[26]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[28]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[28]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[30]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[32]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[32]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[34]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[34]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[36]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[36]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[38]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[38]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[40]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[40]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[40]{'contents'}[1]{'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'}[40]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[40]{'contents'}[0]{'contents'}[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 05e4d65ac5..e3d6bbffb2 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
@@ -31,23 +31,28 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -99,23 +107,28 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -131,24 +144,27 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3646,23 +3662,28 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'printindex'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'printindex'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -3679,24 +3700,27 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'printindex'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'printindex'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3843,49 +3867,49 @@ 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'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]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'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'}[3]{'contents'}[3]{'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'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'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'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[9]{'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'}[11]{'contents'}[2]{'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'}[13]{'contents'}[1]{'contents'}[0]{'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'}[15]{'contents'}[2]{'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'}[17]{'contents'}[2]{'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'}[17]{'contents'}[2]{'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'}[17]{'contents'}[2]{'contents'}[4]{'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'}[19]{'contents'}[1]{'contents'}[0]{'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'}[19]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[21]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'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'}[21]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'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'}[21]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'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'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'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'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'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'}[23]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'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'}[23]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'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'}[23]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[25]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'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'}[25]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[27]{'contents'}[1]{'contents'}[0]{'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'}[27]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[29]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'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'}[29]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[31]{'contents'}[1]{'contents'}[0]{'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'}[31]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[33]{'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'}[33]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[35]{'contents'}[1]{'contents'}[0]{'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'}[35]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[37]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'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'}[37]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[37]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'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'}[1]{'contents'}[0]{'contents'}[2]{'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'}[1]{'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]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'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'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'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'}[4]{'contents'}[3]{'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'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'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'}[6]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[10]{'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'}[12]{'contents'}[2]{'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'}[14]{'contents'}[1]{'contents'}[0]{'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'}[16]{'contents'}[2]{'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'}[18]{'contents'}[2]{'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'}[18]{'contents'}[2]{'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'}[18]{'contents'}[2]{'contents'}[4]{'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'}[20]{'contents'}[1]{'contents'}[0]{'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'}[20]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[22]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'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'}[22]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'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'}[22]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[24]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'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'}[24]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'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'}[24]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'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'}[24]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'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'}[24]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'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'}[24]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'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'}[26]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[28]{'contents'}[1]{'contents'}[0]{'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'}[28]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'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'}[30]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[32]{'contents'}[1]{'contents'}[0]{'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'}[32]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[34]{'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'}[34]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[36]{'contents'}[1]{'contents'}[0]{'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'}[36]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[38]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'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'}[38]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[40]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'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'}[40]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'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'}[40]{'contents'}[1]{'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'}[40]{'extra'}{'command_as_argument'}
 = 
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[40]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'indices_in_begin_tables_lists_entries_after_item'} = '\\input 
texinfo.tex
 
diff --git a/tp/t/results/converters_tests/link.pl 
b/tp/t/results/converters_tests/link.pl
index a26b1f4da3..6d9e6d16f0 100644
--- a/tp/t/results/converters_tests/link.pl
+++ b/tp/t/results/converters_tests/link.pl
@@ -11,23 +11,28 @@ $result_trees{'link'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'One'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'One'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'One'
@@ -42,24 +47,27 @@ $result_trees{'link'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'ONEX'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'ONEX'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -93,24 +101,27 @@ $result_trees{'link'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Two'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Two'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -513,12 +524,12 @@ $result_trees{'link'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'link'}{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'link'}{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'link'}{'contents'}[3]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'link'}{'contents'}[3]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'link'}{'contents'}[3]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'link'}{'contents'}[3]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'link'}{'contents'}[3]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'link'}{'contents'}[3]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'link'}{'contents'}[3]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'link'}{'contents'}[3]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'link'}{'contents'}[3]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'link'}{'contents'}[3]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'link'}{'contents'}[3]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'link'}{'contents'}[3]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'link'}{'contents'}[3]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'link'}{'contents'}[3]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'link'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'link'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'link'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'link'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'link'}{'contents'}[3]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'link'}{'contents'}[3]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'link'}{'contents'}[3]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'link'}{'contents'}[3]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'link'} = '@node One
 @chapter ONEX
diff --git a/tp/t/results/converters_tests/non_empty_part.pl 
b/tp/t/results/converters_tests/non_empty_part.pl
index dc95ea98d2..dceeaf9ced 100644
--- a/tp/t/results/converters_tests/non_empty_part.pl
+++ b/tp/t/results/converters_tests/non_empty_part.pl
@@ -11,24 +11,27 @@ $result_trees{'non_empty_part'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'part before'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'part before'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -60,23 +63,28 @@ $result_trees{'non_empty_part'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -91,24 +99,27 @@ $result_trees{'non_empty_part'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -277,24 +288,27 @@ $result_trees{'non_empty_part'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'part I'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'part I'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -326,24 +340,27 @@ $result_trees{'non_empty_part'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap in Top node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap in Top node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -364,24 +381,27 @@ $result_trees{'non_empty_part'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Part II'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Part II'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -413,23 +433,28 @@ $result_trees{'non_empty_part'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'part chapter node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'part chapter node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'part-chapter-node'
@@ -444,24 +469,27 @@ $result_trees{'non_empty_part'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'part III'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'part III'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -493,24 +521,27 @@ $result_trees{'non_empty_part'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter with part node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter with part node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -531,24 +562,27 @@ $result_trees{'non_empty_part'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Part IV'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Part IV'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -580,24 +614,27 @@ $result_trees{'non_empty_part'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Part V'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Part V'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -629,24 +666,27 @@ $result_trees{'non_empty_part'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'with part no node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'with part no node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -667,24 +707,27 @@ $result_trees{'non_empty_part'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Part VI'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Part VI'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -716,24 +759,27 @@ $result_trees{'non_empty_part'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node between part and chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node between part and chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -754,24 +800,27 @@ $result_trees{'non_empty_part'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter after part node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter after part node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -794,8 +843,8 @@ $result_trees{'non_empty_part'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 $result_trees{'non_empty_part'}{'contents'}[3]{'extra'}{'associated_part'} = 
$result_trees{'non_empty_part'}{'contents'}[1];
 $result_trees{'non_empty_part'}{'contents'}[5]{'extra'}{'associated_part'} = 
$result_trees{'non_empty_part'}{'contents'}[4];
 $result_trees{'non_empty_part'}{'contents'}[9]{'extra'}{'associated_part'} = 
$result_trees{'non_empty_part'}{'contents'}[8];
diff --git a/tp/t/results/converters_tests/non_empty_part_no_top_node_output.pl 
b/tp/t/results/converters_tests/non_empty_part_no_top_node_output.pl
index 2dd553c3f0..c9be839cc0 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
@@ -11,24 +11,27 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'part before'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'part before'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -60,23 +63,28 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -91,24 +99,27 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -277,24 +288,27 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'part I'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'part I'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -326,24 +340,27 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap in Top node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap in Top node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -364,24 +381,27 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Part II'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Part II'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -413,23 +433,28 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'part chapter node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'part chapter node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'part-chapter-node'
@@ -444,24 +469,27 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'part III'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'part III'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -493,24 +521,27 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter with part node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter with part node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -531,24 +562,27 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Part IV'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Part IV'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -580,24 +614,27 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Part V'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Part V'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -629,24 +666,27 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'with part no node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'with part no node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -667,24 +707,27 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Part VI'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Part VI'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -716,24 +759,27 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node between part and chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node between part and chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -754,24 +800,27 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter after part node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter after part node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -794,8 +843,8 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'extra'}{'associated_part'}
 = $result_trees{'non_empty_part_no_top_node_output'}{'contents'}[1];
 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[5]{'extra'}{'associated_part'}
 = $result_trees{'non_empty_part_no_top_node_output'}{'contents'}[4];
 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[9]{'extra'}{'associated_part'}
 = $result_trees{'non_empty_part_no_top_node_output'}{'contents'}[8];
diff --git 
a/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl 
b/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
index 4e29660835..f869b3115a 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
@@ -16,23 +16,28 @@ $result_trees{'printindex_merged_indices_code_style'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'printindex_merged_indices_code_style'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'printindex_merged_indices_code_style'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -114,24 +127,27 @@ $result_trees{'printindex_merged_indices_code_style'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -616,11 +632,11 @@ $result_trees{'printindex_merged_indices_code_style'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[7]{'extra'}{'element_node'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
-$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
-$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[15]{'extra'}{'element_node'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
-$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[21]{'extra'}{'element_node'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[16]{'extra'}{'element_node'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[22]{'extra'}{'element_node'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
 
 $result_texis{'printindex_merged_indices_code_style'} = '@node Top
 @top top
diff --git a/tp/t/results/converters_tests/ref_in_sectioning.pl 
b/tp/t/results/converters_tests/ref_in_sectioning.pl
index 56bfd263fd..3029211a97 100644
--- a/tp/t/results/converters_tests/ref_in_sectioning.pl
+++ b/tp/t/results/converters_tests/ref_in_sectioning.pl
@@ -32,23 +32,28 @@ $result_trees{'ref_in_sectioning'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,136 +68,139 @@ $result_trees{'ref_in_sectioning'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'for example '
-            },
-            {
-              'cmdname' => 'ref',
               'contents' => [
                 {
-                  'contents' => [
-                    {
-                      'text' => 'node'
-                    }
-                  ],
-                  'extra' => {
-                    'node_content' => {
-                      'contents' => [
-                        {}
-                      ]
-                    },
-                    'normalized' => 'node'
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 4
-              }
-            },
-            {
-              'text' => ' ('
-            },
-            {
-              'cmdname' => 'pxref',
-              'contents' => [
+                  'text' => 'for example '
+                },
                 {
+                  'cmdname' => 'ref',
                   'contents' => [
                     {
-                      'text' => 'node'
-                    }
-                  ],
-                  'extra' => {
-                    'node_content' => {
                       'contents' => [
-                        {}
-                      ]
-                    },
-                    'normalized' => 'node'
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 4
-              }
-            },
-            {
-              'text' => ') ('
-            },
-            {
-              'cmdname' => 'pxref',
-              'contents' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'Top'
+                        {
+                          'text' => 'node'
+                        }
+                      ],
+                      'extra' => {
+                        'node_content' => {
+                          'contents' => [
+                            {}
+                          ]
+                        },
+                        'normalized' => 'node'
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'extra' => {
-                    'node_content' => {
-                      'contents' => [
-                        {}
-                      ]
-                    }
-                  },
-                  'type' => 'brace_arg'
-                },
-                {
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 4
+                  }
                 },
                 {
-                  'type' => 'brace_arg'
+                  'text' => ' ('
                 },
                 {
+                  'cmdname' => 'pxref',
                   'contents' => [
                     {
-                      'text' => 'file'
+                      'contents' => [
+                        {
+                          'text' => 'node'
+                        }
+                      ],
+                      'extra' => {
+                        'node_content' => {
+                          'contents' => [
+                            {}
+                          ]
+                        },
+                        'normalized' => 'node'
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 4
+                  }
+                },
+                {
+                  'text' => ') ('
                 },
                 {
+                  'cmdname' => 'pxref',
                   'contents' => [
                     {
-                      'text' => 'Manual'
+                      'contents' => [
+                        {
+                          'text' => 'Top'
+                        }
+                      ],
+                      'extra' => {
+                        'node_content' => {
+                          'contents' => [
+                            {}
+                          ]
+                        }
+                      },
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'file'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'Manual'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 4
+                  }
+                },
+                {
+                  'text' => ')'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 4
-              }
-            },
-            {
-              'text' => ')'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -359,23 +367,28 @@ $result_trees{'ref_in_sectioning'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node'
@@ -390,84 +403,87 @@ $result_trees{'ref_in_sectioning'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'xref',
               'contents' => [
                 {
+                  'cmdname' => 'xref',
                   'contents' => [
                     {
-                      'text' => 'node'
-                    }
-                  ],
-                  'extra' => {
-                    'node_content' => {
                       'contents' => [
-                        {}
-                      ]
-                    }
-                  },
-                  'type' => 'brace_arg'
-                },
-                {
-                  'type' => 'brace_arg'
-                },
-                {
-                  'contents' => [
+                        {
+                          'text' => 'node'
+                        }
+                      ],
+                      'extra' => {
+                        'node_content' => {
+                          'contents' => [
+                            {}
+                          ]
+                        }
+                      },
+                      'type' => 'brace_arg'
+                    },
                     {
-                      'text' => 'title'
-                    }
-                  ],
-                  'type' => 'brace_arg'
-                },
-                {
-                  'contents' => [
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'title'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'file name'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
+                    },
                     {
-                      'text' => 'file name'
+                      'contents' => [
+                        {
+                          'text' => 'Manual'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 12
+                  }
                 },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'Manual'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
+                  'text' => '.'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 12
-              }
-            },
-            {
-              'text' => '.'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -487,23 +503,28 @@ $result_trees{'ref_in_sectioning'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -518,48 +539,51 @@ $result_trees{'ref_in_sectioning'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'ref',
               'contents' => [
                 {
+                  'cmdname' => 'ref',
                   'contents' => [
                     {
-                      'text' => 'node'
-                    }
-                  ],
-                  'extra' => {
-                    'node_content' => {
                       'contents' => [
-                        {}
-                      ]
-                    },
-                    'normalized' => 'node'
-                  },
-                  'type' => 'brace_arg'
+                        {
+                          'text' => 'node'
+                        }
+                      ],
+                      'extra' => {
+                        'node_content' => {
+                          'contents' => [
+                            {}
+                          ]
+                        },
+                        'normalized' => 'node'
+                      },
+                      'type' => 'brace_arg'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 15
+                  }
+                },
+                {
+                  'text' => ' just node'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 15
-              }
-            },
-            {
-              'text' => ' just node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -579,136 +603,139 @@ $result_trees{'ref_in_sectioning'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'for example '
-            },
-            {
-              'cmdname' => 'ref',
               'contents' => [
                 {
-                  'contents' => [
-                    {
-                      'text' => 'node'
-                    }
-                  ],
-                  'extra' => {
-                    'node_content' => {
-                      'contents' => [
-                        {}
-                      ]
-                    },
-                    'normalized' => 'node'
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 17
-              }
-            },
-            {
-              'text' => ' ('
-            },
-            {
-              'cmdname' => 'pxref',
-              'contents' => [
+                  'text' => 'for example '
+                },
                 {
+                  'cmdname' => 'ref',
                   'contents' => [
                     {
-                      'text' => 'node'
-                    }
-                  ],
-                  'extra' => {
-                    'node_content' => {
                       'contents' => [
-                        {}
-                      ]
-                    },
-                    'normalized' => 'node'
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 17
-              }
-            },
-            {
-              'text' => ') ('
-            },
-            {
-              'cmdname' => 'pxref',
-              'contents' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'Top'
+                        {
+                          'text' => 'node'
+                        }
+                      ],
+                      'extra' => {
+                        'node_content' => {
+                          'contents' => [
+                            {}
+                          ]
+                        },
+                        'normalized' => 'node'
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'extra' => {
-                    'node_content' => {
-                      'contents' => [
-                        {}
-                      ]
-                    }
-                  },
-                  'type' => 'brace_arg'
-                },
-                {
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 17
+                  }
                 },
                 {
-                  'type' => 'brace_arg'
+                  'text' => ' ('
                 },
                 {
+                  'cmdname' => 'pxref',
                   'contents' => [
                     {
-                      'text' => 'file'
+                      'contents' => [
+                        {
+                          'text' => 'node'
+                        }
+                      ],
+                      'extra' => {
+                        'node_content' => {
+                          'contents' => [
+                            {}
+                          ]
+                        },
+                        'normalized' => 'node'
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 17
+                  }
+                },
+                {
+                  'text' => ') ('
                 },
                 {
+                  'cmdname' => 'pxref',
                   'contents' => [
                     {
-                      'text' => 'Manual'
+                      'contents' => [
+                        {
+                          'text' => 'Top'
+                        }
+                      ],
+                      'extra' => {
+                        'node_content' => {
+                          'contents' => [
+                            {}
+                          ]
+                        }
+                      },
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'file'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'Manual'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 17
+                  }
+                },
+                {
+                  'text' => ')'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 17
-              }
-            },
-            {
-              'text' => ')'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -728,61 +755,64 @@ $result_trees{'ref_in_sectioning'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'ref',
               'contents' => [
                 {
+                  'cmdname' => 'ref',
                   'contents' => [
                     {
-                      'text' => 'node'
-                    }
-                  ],
-                  'extra' => {
-                    'node_content' => {
                       'contents' => [
-                        {}
-                      ]
+                        {
+                          'text' => 'node'
+                        }
+                      ],
+                      'extra' => {
+                        'node_content' => {
+                          'contents' => [
+                            {}
+                          ]
+                        },
+                        'normalized' => 'node'
+                      },
+                      'type' => 'brace_arg'
                     },
-                    'normalized' => 'node'
-                  },
-                  'type' => 'brace_arg'
-                },
-                {
-                  'contents' => [
                     {
-                      'text' => 'cross ref name'
+                      'contents' => [
+                        {
+                          'text' => 'cross ref name'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 19
+                  }
+                },
+                {
+                  'text' => '  node, crossref arg2'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 19
-              }
-            },
-            {
-              'text' => '  node, crossref arg2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -802,90 +832,93 @@ $result_trees{'ref_in_sectioning'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'ref',
               'contents' => [
                 {
+                  'cmdname' => 'ref',
                   'contents' => [
                     {
-                      'cmdname' => 'code',
                       'contents' => [
                         {
+                          'cmdname' => 'code',
                           'contents' => [
                             {
-                              'text' => 'node'
+                              'contents' => [
+                                {
+                                  'text' => 'node'
+                                }
+                              ],
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'brace_container'
+                          'source_info' => {
+                            'line_nr' => 21
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 21
-                      }
-                    }
-                  ],
-                  'extra' => {
-                    'node_content' => {
-                      'contents' => [
-                        {}
-                      ]
+                      'extra' => {
+                        'node_content' => {
+                          'contents' => [
+                            {}
+                          ]
+                        },
+                        'normalized' => 'node'
+                      },
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'type' => 'brace_arg'
                     },
-                    'normalized' => 'node'
-                  },
-                  'type' => 'brace_arg'
-                },
-                {
-                  'type' => 'brace_arg'
-                },
-                {
-                  'contents' => [
                     {
-                      'cmdname' => 'samp',
                       'contents' => [
                         {
+                          'cmdname' => 'samp',
                           'contents' => [
                             {
-                              'text' => 'title'
+                              'contents' => [
+                                {
+                                  'text' => 'title'
+                                }
+                              ],
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'brace_container'
+                          'source_info' => {
+                            'line_nr' => 21
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 21
-                      }
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 21
+                  }
+                },
+                {
+                  'text' => '  code node, samptitle arg3'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 21
-              }
-            },
-            {
-              'text' => '  code node, samptitle arg3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -905,79 +938,82 @@ $result_trees{'ref_in_sectioning'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'ref',
               'contents' => [
                 {
+                  'cmdname' => 'ref',
                   'contents' => [
                     {
-                      'cmdname' => 'code',
                       'contents' => [
                         {
+                          'cmdname' => 'code',
                           'contents' => [
                             {
-                              'text' => 'node'
+                              'contents' => [
+                                {
+                                  'text' => 'node'
+                                }
+                              ],
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'brace_container'
+                          'source_info' => {
+                            'line_nr' => 23
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 23
-                      }
-                    }
-                  ],
-                  'extra' => {
-                    'node_content' => {
+                      'extra' => {
+                        'node_content' => {
+                          'contents' => [
+                            {}
+                          ]
+                        }
+                      },
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'type' => 'brace_arg'
+                    },
+                    {
                       'contents' => [
-                        {}
-                      ]
+                        {
+                          'text' => 'file name'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
-                  },
-                  'type' => 'brace_arg'
-                },
-                {
-                  'type' => 'brace_arg'
-                },
-                {
-                  'type' => 'brace_arg'
+                  ],
+                  'source_info' => {
+                    'line_nr' => 23
+                  }
                 },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'file name'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
+                  'text' => ' code node, file name'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 23
-              }
-            },
-            {
-              'text' => ' code node, file name'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -997,72 +1033,75 @@ $result_trees{'ref_in_sectioning'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'ref',
               'contents' => [
                 {
+                  'cmdname' => 'ref',
                   'contents' => [
                     {
-                      'text' => 'node'
-                    }
-                  ],
-                  'extra' => {
-                    'node_content' => {
                       'contents' => [
-                        {}
-                      ]
-                    }
-                  },
-                  'type' => 'brace_arg'
-                },
-                {
-                  'type' => 'brace_arg'
-                },
-                {
-                  'type' => 'brace_arg'
-                },
-                {
-                  'type' => 'brace_arg'
-                },
-                {
-                  'contents' => [
+                        {
+                          'text' => 'node'
+                        }
+                      ],
+                      'extra' => {
+                        'node_content' => {
+                          'contents' => [
+                            {}
+                          ]
+                        }
+                      },
+                      'type' => 'brace_arg'
+                    },
                     {
-                      'text' => 'Manual'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => ' '
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'type' => 'brace_arg'
                     },
-                    'spaces_before_argument' => {
-                      'text' => ' '
+                    {
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'Manual'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_after_argument' => {
+                          'text' => ' '
+                        },
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
-                  },
-                  'type' => 'brace_arg'
+                  ],
+                  'source_info' => {
+                    'line_nr' => 25
+                  }
+                },
+                {
+                  'text' => ' node and manual'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 25
-              }
-            },
-            {
-              'text' => ' node and manual'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1082,72 +1121,75 @@ $result_trees{'ref_in_sectioning'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'ref',
               'contents' => [
                 {
+                  'cmdname' => 'ref',
                   'contents' => [
                     {
-                      'text' => 'Top'
-                    }
-                  ],
-                  'extra' => {
-                    'node_content' => {
                       'contents' => [
-                        {}
-                      ]
-                    }
-                  },
-                  'type' => 'brace_arg'
-                },
-                {
-                  'type' => 'brace_arg'
-                },
-                {
-                  'type' => 'brace_arg'
-                },
-                {
-                  'type' => 'brace_arg'
-                },
-                {
-                  'contents' => [
+                        {
+                          'text' => 'Top'
+                        }
+                      ],
+                      'extra' => {
+                        'node_content' => {
+                          'contents' => [
+                            {}
+                          ]
+                        }
+                      },
+                      'type' => 'brace_arg'
+                    },
                     {
-                      'text' => 'Manual'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => ' '
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'type' => 'brace_arg'
                     },
-                    'spaces_before_argument' => {
-                      'text' => ' '
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'Manual'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_after_argument' => {
+                          'text' => ' '
+                        },
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
-                  },
-                  'type' => 'brace_arg'
+                  ],
+                  'source_info' => {
+                    'line_nr' => 27
+                  }
+                },
+                {
+                  'text' => ' Top and manual'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 27
-              }
-            },
-            {
-              'text' => ' Top and manual'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1167,60 +1209,63 @@ $result_trees{'ref_in_sectioning'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'ref',
               'contents' => [
                 {
-                  'type' => 'brace_arg'
-                },
-                {
-                  'type' => 'brace_arg'
-                },
-                {
-                  'type' => 'brace_arg'
-                },
-                {
-                  'type' => 'brace_arg'
-                },
-                {
+                  'cmdname' => 'ref',
                   'contents' => [
                     {
-                      'text' => 'Manual'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => ' '
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'type' => 'brace_arg'
                     },
-                    'spaces_before_argument' => {
-                      'text' => ' '
+                    {
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'Manual'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_after_argument' => {
+                          'text' => ' '
+                        },
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
-                  },
-                  'type' => 'brace_arg'
+                  ],
+                  'source_info' => {
+                    'line_nr' => 29
+                  }
+                },
+                {
+                  'text' => ' no node just manual'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 29
-              }
-            },
-            {
-              'text' => ' no node just manual'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1240,54 +1285,57 @@ $result_trees{'ref_in_sectioning'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'ref',
               'contents' => [
                 {
-                  'type' => 'brace_arg'
-                },
-                {
-                  'type' => 'brace_arg'
-                },
-                {
-                  'type' => 'brace_arg'
-                },
-                {
+                  'cmdname' => 'ref',
                   'contents' => [
                     {
-                      'text' => 'file name'
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'file name'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 31
+                  }
+                },
+                {
+                  'text' => ' no node just file name'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 31
-              }
-            },
-            {
-              'text' => ' no node just file name'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1307,73 +1355,76 @@ $result_trees{'ref_in_sectioning'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
-          'contents' => [
-            {
-              'cmdname' => 'inforef',
-              'contents' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'a'
-                    }
-                  ],
-                  'extra' => {
-                    'node_content' => {
-                      'contents' => [
-                        {}
-                      ]
-                    }
-                  },
-                  'type' => 'brace_arg'
-                },
+          'contents' => [
+            {
+              'contents' => [
                 {
+                  'cmdname' => 'inforef',
                   'contents' => [
                     {
-                      'text' => 'b'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'extra' => {
+                        'node_content' => {
+                          'contents' => [
+                            {}
+                          ]
+                        }
+                      },
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'b'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'c'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 33
+                  }
                 },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'c'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
+                  'text' => ' inforef a b c'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 33
-              }
-            },
-            {
-              'text' => ' inforef a b c'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => ' 
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => ' 
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1393,80 +1444,83 @@ $result_trees{'ref_in_sectioning'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '('
-            },
-            {
-              'cmdname' => 'pxref',
               'contents' => [
                 {
+                  'text' => '('
+                },
+                {
+                  'cmdname' => 'pxref',
                   'contents' => [
                     {
-                      'text' => 'Top'
-                    }
-                  ],
-                  'extra' => {
-                    'node_content' => {
                       'contents' => [
-                        {}
-                      ]
-                    }
-                  },
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => ' '
+                        {
+                          'text' => 'Top'
+                        }
+                      ],
+                      'extra' => {
+                        'node_content' => {
+                          'contents' => [
+                            {}
+                          ]
+                        }
+                      },
+                      'info' => {
+                        'spaces_after_argument' => {
+                          'text' => ' '
+                        },
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     },
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
-                },
-                {
-                  'type' => 'brace_arg'
-                },
-                {
-                  'type' => 'brace_arg'
-                },
-                {
-                  'contents' => [
                     {
-                      'text' => 'file name'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => ' '
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'type' => 'brace_arg'
                     },
-                    'spaces_before_argument' => {
-                      'text' => ' '
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'file name'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_after_argument' => {
+                          'text' => ' '
+                        },
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
-                  },
-                  'type' => 'brace_arg'
+                  ],
+                  'source_info' => {
+                    'line_nr' => 35
+                  }
+                },
+                {
+                  'text' => ') pxref Top file name, spaces'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 35
-              }
-            },
-            {
-              'text' => ') pxref Top file name, spaces'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1486,60 +1540,63 @@ $result_trees{'ref_in_sectioning'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '('
-            },
-            {
-              'cmdname' => 'pxref',
               'contents' => [
                 {
-                  'type' => 'brace_arg'
-                },
-                {
-                  'type' => 'brace_arg'
-                },
-                {
-                  'type' => 'brace_arg'
+                  'text' => '('
                 },
                 {
+                  'cmdname' => 'pxref',
                   'contents' => [
                     {
-                      'text' => 'file name'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => ' '
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'type' => 'brace_arg'
                     },
-                    'spaces_before_argument' => {
-                      'text' => ' '
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'file name'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_after_argument' => {
+                          'text' => ' '
+                        },
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
-                  },
-                  'type' => 'brace_arg'
+                  ],
+                  'source_info' => {
+                    'line_nr' => 37
+                  }
+                },
+                {
+                  'text' => ') pxref file name only, spaces'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 37
-              }
-            },
-            {
-              'text' => ') pxref file name only, spaces'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1559,61 +1616,64 @@ $result_trees{'ref_in_sectioning'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'xref',
               'contents' => [
                 {
+                  'cmdname' => 'xref',
                   'contents' => [
                     {
-                      'text' => 'Top'
-                    }
-                  ],
-                  'extra' => {
-                    'node_content' => {
                       'contents' => [
-                        {}
-                      ]
-                    }
-                  },
-                  'type' => 'brace_arg'
-                },
-                {
-                  'type' => 'brace_arg'
-                },
-                {
-                  'type' => 'brace_arg'
-                },
-                {
-                  'contents' => [
+                        {
+                          'text' => 'Top'
+                        }
+                      ],
+                      'extra' => {
+                        'node_content' => {
+                          'contents' => [
+                            {}
+                          ]
+                        }
+                      },
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'type' => 'brace_arg'
+                    },
                     {
-                      'text' => 'filename'
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'filename'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 39
+                  }
+                },
+                {
+                  'text' => ', xref Top filename only, no spaces'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 39
-              }
-            },
-            {
-              'text' => ', xref Top filename only, no spaces'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1633,49 +1693,52 @@ $result_trees{'ref_in_sectioning'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'xref',
               'contents' => [
                 {
-                  'type' => 'brace_arg'
-                },
-                {
-                  'type' => 'brace_arg'
-                },
-                {
-                  'type' => 'brace_arg'
-                },
-                {
+                  'cmdname' => 'xref',
                   'contents' => [
                     {
-                      'text' => 'filename'
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'filename'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 41
+                  }
+                },
+                {
+                  'text' => '. xref filename only, no spaces'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 41
-              }
-            },
-            {
-              'text' => '. xref filename only, no spaces'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1697,24 +1760,24 @@ $result_trees{'ref_in_sectioning'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'args'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[7]{'args'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[9]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[9]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[10]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[11]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[12]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[15]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_sectioning'}{'contents'}[18]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[18]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_sectioning'}{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'ref_in_sectioning'} = '@contents
 
diff --git 
a/tp/t/results/converters_tests/reference_for_formatting_customizations.pl 
b/tp/t/results/converters_tests/reference_for_formatting_customizations.pl
index f1f134ea31..aee8309777 100644
--- a/tp/t/results/converters_tests/reference_for_formatting_customizations.pl
+++ b/tp/t/results/converters_tests/reference_for_formatting_customizations.pl
@@ -16,23 +16,28 @@ $result_trees{'reference_for_formatting_customizations'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -48,24 +53,27 @@ $result_trees{'reference_for_formatting_customizations'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -84,23 +92,28 @@ $result_trees{'reference_for_formatting_customizations'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapt'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapt'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapt'
@@ -116,24 +129,27 @@ $result_trees{'reference_for_formatting_customizations'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 9e5c918db1..53e7f24674 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
@@ -162,23 +162,28 @@ $result_trees{'references_to_top_no_top_output'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -193,24 +198,27 @@ $result_trees{'references_to_top_no_top_output'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -606,23 +614,28 @@ $result_trees{'references_to_top_no_top_output'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -638,24 +651,27 @@ $result_trees{'references_to_top_no_top_output'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1086,20 +1102,20 @@ $result_trees{'references_to_top_no_top_output'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'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'}[2];
-$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'}[14]{'extra'}{'element_node'}
 = $result_trees{'references_to_top_no_top_output'}{'contents'}[1];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[0];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'contents'}[0]{'contents'}[0];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'contents'}[10]{'contents'}[0]{'contents'}[0];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'references_to_top_no_top_output'}{'contents'}[3];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'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'}[2];
-$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'}[2]{'contents'}[13]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[13];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[13]{'extra'}{'caption'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[13]{'contents'}[2];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[13]{'extra'}{'float_section'}
 = $result_trees{'references_to_top_no_top_output'}{'contents'}[2];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[15]{'extra'}{'element_node'}
 = $result_trees{'references_to_top_no_top_output'}{'contents'}[1];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[2]{'contents'}[8]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[2]{'contents'}[8]{'contents'}[0]{'contents'}[0];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[2]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[0];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'references_to_top_no_top_output'}{'contents'}[3];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[8]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[8];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[8]{'extra'}{'caption'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[8]{'contents'}[2];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[8]{'extra'}{'float_section'}
 = $result_trees{'references_to_top_no_top_output'}{'contents'}[4];
 
 $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 643424be81..d444ff660d 100644
--- a/tp/t/results/converters_tests/refs_formatting.pl
+++ b/tp/t/results/converters_tests/refs_formatting.pl
@@ -11,23 +11,28 @@ $result_trees{'refs_formatting'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -42,24 +47,27 @@ $result_trees{'refs_formatting'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2819,52 +2827,52 @@ $result_trees{'refs_formatting'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[30]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[34]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[42]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[46]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[54]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[54]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'contents'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'contents'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'contents'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'contents'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'contents'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'contents'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'contents'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'contents'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'contents'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'contents'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'contents'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'contents'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'contents'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'contents'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'contents'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'contents'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'contents'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'contents'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'contents'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'contents'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'contents'}[0]{'contents'}[1];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'contents'}[0]{'contents'}[3];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[6]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[10]{'contents'}[0]{'contents'}[0];
-$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[14]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[18]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[18]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[26]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[26]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[30]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[30]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[34]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[34]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[38]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[38]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[42]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[42]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[46]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[46]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[50]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[50]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[54]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[2]{'contents'}[54]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[10]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[14]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[14]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[14]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[18]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[18]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[18]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[18]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[22]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[22]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[22]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[22]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[26]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[26]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[30]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[30]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[30]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[30]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[34]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[34]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[34]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[34]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[38]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[38]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[38]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[38]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[42]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[42]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[42]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[42]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[46]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[46]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[46]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[46]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[50]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[50]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[50]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[50]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[54]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[54]{'contents'}[0]{'contents'}[1];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[54]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[4]{'contents'}[54]{'contents'}[0]{'contents'}[3];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[6]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[6]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[6]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[6]{'contents'}[10]{'contents'}[0]{'contents'}[0];
+$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[6]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'refs_formatting'}{'contents'}[2]{'contents'}[6]{'contents'}[14]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'refs_formatting'} = '@node chapter
 @chapter chapter
diff --git a/tp/t/results/converters_tests/sections_and_printindex.pl 
b/tp/t/results/converters_tests/sections_and_printindex.pl
index 4f00938b38..b31070d425 100644
--- a/tp/t/results/converters_tests/sections_and_printindex.pl
+++ b/tp/t/results/converters_tests/sections_and_printindex.pl
@@ -11,23 +11,28 @@ $result_trees{'sections_and_printindex'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'sections_and_printindex'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'for example'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'for example'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -77,23 +85,28 @@ $result_trees{'sections_and_printindex'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node'
@@ -108,24 +121,27 @@ $result_trees{'sections_and_printindex'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -181,23 +197,28 @@ $result_trees{'sections_and_printindex'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -213,24 +234,27 @@ $result_trees{'sections_and_printindex'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -286,24 +310,27 @@ $result_trees{'sections_and_printindex'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'App'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'App'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -362,8 +389,8 @@ $result_trees{'sections_and_printindex'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'sections_and_printindex'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'sections_and_printindex'}{'contents'}[3];
-$result_trees{'sections_and_printindex'}{'contents'}[6]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'sections_and_printindex'}{'contents'}[5];
+$result_trees{'sections_and_printindex'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'sections_and_printindex'}{'contents'}[3];
+$result_trees{'sections_and_printindex'}{'contents'}[6]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'sections_and_printindex'}{'contents'}[5];
 
 $result_texis{'sections_and_printindex'} = '@node Top
 @top for example
diff --git a/tp/t/results/converters_tests/setfilename_no_extension.pl 
b/tp/t/results/converters_tests/setfilename_no_extension.pl
index 9b11cb3a7b..f323e9d209 100644
--- a/tp/t/results/converters_tests/setfilename_no_extension.pl
+++ b/tp/t/results/converters_tests/setfilename_no_extension.pl
@@ -53,23 +53,28 @@ $result_trees{'setfilename_no_extension'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -84,24 +89,27 @@ $result_trees{'setfilename_no_extension'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -119,24 +127,27 @@ $result_trees{'setfilename_no_extension'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/converters_tests/simplest_test_prefix.pl 
b/tp/t/results/converters_tests/simplest_test_prefix.pl
index 04c4ddde5d..ca4b97d7df 100644
--- a/tp/t/results/converters_tests/simplest_test_prefix.pl
+++ b/tp/t/results/converters_tests/simplest_test_prefix.pl
@@ -31,24 +31,27 @@ $result_trees{'simplest_test_prefix'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 757eed14a1..df88a4b27a 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
@@ -18,23 +18,28 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -49,24 +54,27 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -403,226 +411,231 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'A '
-            },
-            {
-              'cmdname' => 'sc',
               'contents' => [
                 {
+                  'text' => 'A '
+                },
+                {
+                  'cmdname' => 'sc',
                   'contents' => [
                     {
-                      'text' => 'sc '
-                    },
-                    {
-                      'cmdname' => '~',
                       'contents' => [
                         {
+                          'text' => 'sc '
+                        },
+                        {
+                          'cmdname' => '~',
+                          'contents' => [
+                            {
+                              'contents' => [
+                                {
+                                  'text' => 'n'
+                                }
+                              ],
+                              'type' => 'following_arg'
+                            }
+                          ],
+                          'source_info' => {
+                            'line_nr' => 9
+                          }
+                        },
+                        {
+                          'text' => ' '
+                        },
+                        {
+                          'cmdname' => 'aa',
                           'contents' => [
                             {
-                              'text' => 'n'
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'following_arg'
-                        }
-                      ],
-                      'source_info' => {
-                        'line_nr' => 9
-                      }
-                    },
-                    {
-                      'text' => ' '
-                    },
-                    {
-                      'cmdname' => 'aa',
-                      'contents' => [
+                          'source_info' => {
+                            'line_nr' => 9
+                          }
+                        },
                         {
-                          'type' => 'brace_container'
-                        }
-                      ],
-                      'source_info' => {
-                        'line_nr' => 9
-                      }
-                    },
-                    {
-                      'text' => ' '
-                    },
-                    {
-                      'cmdname' => 'TeX',
-                      'contents' => [
+                          'text' => ' '
+                        },
                         {
-                          'type' => 'brace_container'
+                          'cmdname' => 'TeX',
+                          'contents' => [
+                            {
+                              'type' => 'brace_container'
+                            }
+                          ],
+                          'source_info' => {
+                            'line_nr' => 9
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 9
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 9
-              }
-            },
-            {
-              'text' => ' node '
-            },
-            {
-              'cmdname' => '"',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 9
+                  }
+                },
                 {
+                  'text' => ' node '
+                },
+                {
+                  'cmdname' => '"',
                   'contents' => [
                     {
-                      'text' => 'i'
+                      'contents' => [
+                        {
+                          'text' => 'i'
+                        }
+                      ],
+                      'type' => 'following_arg'
                     }
                   ],
-                  'type' => 'following_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 9
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '"',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 9
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '"',
                   'contents' => [
                     {
-                      'cmdname' => 'dotless',
                       'contents' => [
                         {
+                          'cmdname' => 'dotless',
                           'contents' => [
                             {
-                              'text' => 'i'
+                              'contents' => [
+                                {
+                                  'text' => 'i'
+                                }
+                              ],
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'brace_container'
+                          'source_info' => {
+                            'line_nr' => 9
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 9
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 9
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '`',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 9
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '`',
                   'contents' => [
                     {
-                      'cmdname' => '=',
                       'contents' => [
                         {
+                          'cmdname' => '=',
                           'contents' => [
                             {
-                              'text' => 'E'
+                              'contents' => [
+                                {
+                                  'text' => 'E'
+                                }
+                              ],
+                              'type' => 'following_arg'
                             }
                           ],
-                          'type' => 'following_arg'
+                          'source_info' => {
+                            'line_nr' => 9
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 9
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 9
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'l',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 9
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 9
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => ',',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'l',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 9
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => ',',
                   'contents' => [
                     {
-                      'cmdname' => '\'',
                       'contents' => [
                         {
+                          'cmdname' => '\'',
                           'contents' => [
                             {
-                              'text' => 'C'
+                              'contents' => [
+                                {
+                                  'text' => 'C'
+                                }
+                              ],
+                              'type' => 'following_arg'
                             }
                           ],
-                          'type' => 'following_arg'
+                          'source_info' => {
+                            'line_nr' => 9
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 9
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 9
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'exclamdown',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 9
+                  }
+                },
                 {
-                  'type' => 'brace_container'
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'exclamdown',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 9
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 9
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 
'A-sc-_00f1-_00e5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
@@ -637,183 +650,186 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'A '
-            },
-            {
-              'cmdname' => 'sc',
               'contents' => [
                 {
+                  'text' => 'A '
+                },
+                {
+                  'cmdname' => 'sc',
                   'contents' => [
                     {
-                      'text' => 'sc'
+                      'contents' => [
+                        {
+                          'text' => 'sc'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 10
-              }
-            },
-            {
-              'text' => ' node '
-            },
-            {
-              'cmdname' => '"',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 10
+                  }
+                },
+                {
+                  'text' => ' node '
+                },
                 {
+                  'cmdname' => '"',
                   'contents' => [
                     {
-                      'text' => 'i'
+                      'contents' => [
+                        {
+                          'text' => 'i'
+                        }
+                      ],
+                      'type' => 'following_arg'
                     }
                   ],
-                  'type' => 'following_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 10
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '"',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 10
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '"',
                   'contents' => [
                     {
-                      'cmdname' => 'dotless',
                       'contents' => [
                         {
+                          'cmdname' => 'dotless',
                           'contents' => [
                             {
-                              'text' => 'i'
+                              'contents' => [
+                                {
+                                  'text' => 'i'
+                                }
+                              ],
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'brace_container'
+                          'source_info' => {
+                            'line_nr' => 10
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 10
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 10
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '`',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 10
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '`',
                   'contents' => [
                     {
-                      'cmdname' => '=',
                       'contents' => [
                         {
+                          'cmdname' => '=',
                           'contents' => [
                             {
-                              'text' => 'E'
+                              'contents' => [
+                                {
+                                  'text' => 'E'
+                                }
+                              ],
+                              'type' => 'following_arg'
                             }
                           ],
-                          'type' => 'following_arg'
+                          'source_info' => {
+                            'line_nr' => 10
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 10
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 10
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'l',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 10
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 10
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => ',',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'l',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 10
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => ',',
                   'contents' => [
                     {
-                      'cmdname' => '\'',
                       'contents' => [
                         {
+                          'cmdname' => '\'',
                           'contents' => [
                             {
-                              'text' => 'C'
+                              'contents' => [
+                                {
+                                  'text' => 'C'
+                                }
+                              ],
+                              'type' => 'following_arg'
                             }
                           ],
-                          'type' => 'following_arg'
+                          'source_info' => {
+                            'line_nr' => 10
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 10
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 10
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'exclamdown',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 10
+                  }
+                },
                 {
-                  'type' => 'brace_container'
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'exclamdown',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 10
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 10
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1305,48 +1321,48 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[6];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[7];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[8];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[9];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[10];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[11];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[12];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[13];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[4];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[5];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[6];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[7];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[8];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[9];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[10];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[11];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[12];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[13];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[11];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[12];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[13];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[4];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[5];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[6];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[7];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[8];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[9];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[10];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[11];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[12];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[13];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[2];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[3];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[4];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[5];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[6];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[7];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[8];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[9];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[10];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[11];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[12];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[13];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[11];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[12];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[13];
 
 $result_texis{'some_at_commands_in_ref_nodes'} = '
 @node Top
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 f2c22ad1f8..eb8b923afe 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
@@ -11,24 +11,27 @@ $result_trees{'spaces_in_empty_node_names'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -265,27 +268,30 @@ $result_trees{'spaces_in_empty_node_names'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => ' '
-            },
-            {
-              'cmdname' => ' '
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'cmdname' => ' '
+                },
+                {
+                  'cmdname' => ' '
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -302,41 +308,44 @@ $result_trees{'spaces_in_empty_node_names'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'verb',
               'contents' => [
                 {
+                  'cmdname' => 'verb',
                   'contents' => [
                     {
-                      'text' => '  ',
-                      'type' => 'raw'
+                      'contents' => [
+                        {
+                          'text' => '  ',
+                          'type' => 'raw'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'info' => {
+                    'delimiter' => ':'
+                  },
+                  'source_info' => {
+                    'line_nr' => 11
+                  }
                 }
               ],
               'info' => {
-                'delimiter' => ':'
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
               },
-              'source_info' => {
-                'line_nr' => 11
-              }
+              'type' => 'line_arg'
             }
           ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -353,37 +362,40 @@ $result_trees{'spaces_in_empty_node_names'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'w',
               'contents' => [
                 {
+                  'cmdname' => 'w',
                   'contents' => [
                     {
-                      'text' => '  '
+                      'contents' => [
+                        {
+                          'text' => '  '
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 13
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 13
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -545,14 +557,14 @@ $result_trees{'spaces_in_empty_node_names'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[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'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'spaces_in_empty_node_names'} = '@node Top
 
diff --git a/tp/t/results/converters_tests/spaces_in_node_names.pl 
b/tp/t/results/converters_tests/spaces_in_node_names.pl
index df0ff9a959..09a5a894f7 100644
--- a/tp/t/results/converters_tests/spaces_in_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_node_names.pl
@@ -11,24 +11,27 @@ $result_trees{'spaces_in_node_names'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -277,30 +280,33 @@ $result_trees{'spaces_in_node_names'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            },
-            {
-              'cmdname' => ' '
-            },
-            {
-              'cmdname' => ' '
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                },
+                {
+                  'cmdname' => ' '
+                },
+                {
+                  'cmdname' => ' '
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -321,44 +327,47 @@ $result_trees{'spaces_in_node_names'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'b'
-            },
-            {
-              'cmdname' => 'verb',
               'contents' => [
                 {
+                  'text' => 'b'
+                },
+                {
+                  'cmdname' => 'verb',
                   'contents' => [
                     {
-                      'text' => '  ',
-                      'type' => 'raw'
+                      'contents' => [
+                        {
+                          'text' => '  ',
+                          'type' => 'raw'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'info' => {
+                    'delimiter' => ':'
+                  },
+                  'source_info' => {
+                    'line_nr' => 11
+                  }
                 }
               ],
               'info' => {
-                'delimiter' => ':'
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
               },
-              'source_info' => {
-                'line_nr' => 11
-              }
+              'type' => 'line_arg'
             }
           ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -379,40 +388,43 @@ $result_trees{'spaces_in_node_names'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'c'
-            },
-            {
-              'cmdname' => 'w',
               'contents' => [
                 {
+                  'text' => 'c'
+                },
+                {
+                  'cmdname' => 'w',
                   'contents' => [
                     {
-                      'text' => '  '
+                      'contents' => [
+                        {
+                          'text' => '  '
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 13
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 13
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -590,20 +602,20 @@ $result_trees{'spaces_in_node_names'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[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'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1];
-$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1];
+$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
 $result_texis{'spaces_in_node_names'} = '@node Top
 
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl 
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index 6379a7f503..34eabbbd9b 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -85,23 +85,28 @@ $result_trees{'test_deftypefnnewline'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -116,24 +121,27 @@ $result_trees{'test_deftypefnnewline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -151,23 +159,28 @@ $result_trees{'test_deftypefnnewline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -182,24 +195,27 @@ $result_trees{'test_deftypefnnewline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2993,20 +3009,20 @@ $result_trees{'test_deftypefnnewline'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[8]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[12]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[14]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[18]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[20]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[22]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[28]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[30]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
 
 $result_texis{'test_deftypefnnewline'} = '@setfilename 
test_deftypefnnewline.info
 
diff --git a/tp/t/results/converters_tests/test_formatting_customizations.pl 
b/tp/t/results/converters_tests/test_formatting_customizations.pl
index 51f1d45711..51a148089a 100644
--- a/tp/t/results/converters_tests/test_formatting_customizations.pl
+++ b/tp/t/results/converters_tests/test_formatting_customizations.pl
@@ -16,23 +16,28 @@ $result_trees{'test_formatting_customizations'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -48,24 +53,27 @@ $result_trees{'test_formatting_customizations'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -84,23 +92,28 @@ $result_trees{'test_formatting_customizations'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapt'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapt'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapt'
@@ -116,24 +129,27 @@ $result_trees{'test_formatting_customizations'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/converters_tests/things_before_setfilename.pl 
b/tp/t/results/converters_tests/things_before_setfilename.pl
index 572f2c52c8..e9ac2d3994 100644
--- a/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -806,23 +806,28 @@ $result_trees{'things_before_setfilename'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -838,24 +843,27 @@ $result_trees{'things_before_setfilename'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -874,23 +882,28 @@ $result_trees{'things_before_setfilename'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -906,24 +919,27 @@ $result_trees{'things_before_setfilename'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1039,8 +1055,8 @@ 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'conten
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[3]{'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'}[3];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'things_before_setfilename'} = '\\input texinfo
 
diff --git a/tp/t/results/converters_tests/top_in_ref.pl 
b/tp/t/results/converters_tests/top_in_ref.pl
index 7c21d75842..31702ec6aa 100644
--- a/tp/t/results/converters_tests/top_in_ref.pl
+++ b/tp/t/results/converters_tests/top_in_ref.pl
@@ -11,24 +11,27 @@ $result_trees{'top_in_ref'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -49,24 +52,27 @@ $result_trees{'top_in_ref'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap refs node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap refs node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2827,52 +2833,52 @@ $result_trees{'top_in_ref'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[30]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[34]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[38]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[42]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[46]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[50]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[54]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[1]{'contents'}[54]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'contents'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[14]{'contents'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'contents'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[18]{'contents'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'contents'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[22]{'contents'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'contents'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[26]{'contents'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'contents'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[30]{'contents'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'contents'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[34]{'contents'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'contents'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[38]{'contents'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'contents'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[42]{'contents'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'contents'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[46]{'contents'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'contents'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[50]{'contents'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'contents'}[0]{'contents'}[1];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[3]{'contents'}[54]{'contents'}[0]{'contents'}[3];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[6]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[10]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[5]{'contents'}[14]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[18]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[18]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[26]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[26]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[30]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[30]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[34]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[34]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[38]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[38]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[42]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[42]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[46]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[46]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[50]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[50]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[54]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[2]{'contents'}[54]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[10]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[14]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[14]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[14]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[18]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[18]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[18]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[18]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[22]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[22]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[22]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[22]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[26]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[26]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[30]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[30]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[30]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[30]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[34]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[34]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[34]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[34]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[38]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[38]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[38]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[38]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[42]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[42]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[42]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[42]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[46]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[46]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[46]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[46]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[50]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[50]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[50]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[50]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[54]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[54]{'contents'}[0]{'contents'}[1];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[54]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[4]{'contents'}[54]{'contents'}[0]{'contents'}[3];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[6]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[6]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[6]{'contents'}[10]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[6]{'contents'}[10]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[6]{'contents'}[14]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_in_ref'}{'contents'}[2]{'contents'}[6]{'contents'}[14]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'top_in_ref'} = '@node Top
 
diff --git 
a/tp/t/results/converters_tests/various_itemize_command_as_argument.pl 
b/tp/t/results/converters_tests/various_itemize_command_as_argument.pl
index b6ee64d298..816f7243d2 100644
--- a/tp/t/results/converters_tests/various_itemize_command_as_argument.pl
+++ b/tp/t/results/converters_tests/various_itemize_command_as_argument.pl
@@ -11,23 +11,28 @@ $result_trees{'various_itemize_command_as_argument'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'various_itemize_command_as_argument'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -77,23 +85,28 @@ $result_trees{'various_itemize_command_as_argument'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -108,24 +121,27 @@ $result_trees{'various_itemize_command_as_argument'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -983,13 +999,13 @@ $result_trees{'various_itemize_command_as_argument'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[7]{'extra'}{'command_as_argument'}
 = 
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[9]{'extra'}{'command_as_argument'}
 = 
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[11]{'extra'}{'command_as_argument'}
 = 
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[13]{'extra'}{'command_as_argument'}
 = 
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[6]{'extra'}{'command_as_argument'}
 = 
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[8]{'extra'}{'command_as_argument'}
 = 
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[12]{'extra'}{'command_as_argument'}
 = 
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[14]{'extra'}{'command_as_argument'}
 = 
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'various_itemize_command_as_argument'} = '@node Top
 @top top
diff --git 
a/tp/t/results/converters_tests/various_vtable_command_as_argument.pl 
b/tp/t/results/converters_tests/various_vtable_command_as_argument.pl
index f4c5957f9f..b969853c9c 100644
--- a/tp/t/results/converters_tests/various_vtable_command_as_argument.pl
+++ b/tp/t/results/converters_tests/various_vtable_command_as_argument.pl
@@ -11,23 +11,28 @@ $result_trees{'various_vtable_command_as_argument'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'various_vtable_command_as_argument'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -77,23 +85,28 @@ $result_trees{'various_vtable_command_as_argument'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -108,24 +121,27 @@ $result_trees{'various_vtable_command_as_argument'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1282,23 +1298,28 @@ $result_trees{'various_vtable_command_as_argument'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Indices'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Indices'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -1314,24 +1335,27 @@ $result_trees{'various_vtable_command_as_argument'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Print the index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Print the index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1385,28 +1409,28 @@ $result_trees{'various_vtable_command_as_argument'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[7]{'extra'}{'command_as_argument'}
 = 
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[9]{'extra'}{'command_as_argument'}
 = 
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[11]{'extra'}{'command_as_argument'}
 = 
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[13]{'extra'}{'command_as_argument'}
 = 
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[6]{'extra'}{'command_as_argument'}
 = 
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[8]{'extra'}{'command_as_argument'}
 = 
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[12]{'extra'}{'command_as_argument'}
 = 
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[14]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[14]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[14]{'extra'}{'command_as_argument'}
 = 
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'various_vtable_command_as_argument'} = '@node Top
 @top top
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl 
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index 6a87614590..25b1a66ff7 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -18,23 +18,28 @@ $result_trees{'punctuation_in_line_commands'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node! After punc'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node! After punc'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -50,24 +55,27 @@ $result_trees{'punctuation_in_line_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top! After punc'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top! After punc'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -769,14 +777,14 @@ $result_trees{'punctuation_in_line_commands'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'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'}{'shortcaption'}
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[2];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[2]{'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'}[2];
-$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'}[11]{'extra'}{'element_node'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[1];
+$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'extra'}{'float'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[6];
+$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[6]{'extra'}{'float_section'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
+$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[6]{'extra'}{'shortcaption'}
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[6]{'contents'}[2];
+$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'extra'}{'float'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[8];
+$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[8]{'extra'}{'caption'}
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[8]{'contents'}[2];
+$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[8]{'extra'}{'float_section'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
+$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[1];
 
 $result_texis{'punctuation_in_line_commands'} = '
 @node node! After punc
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 8109db2a52..3d01283d18 100644
--- a/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
+++ b/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
@@ -11,23 +11,28 @@ $result_trees{'contain_plain_text_nestings'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'contain_plain_text_nestings'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -77,23 +85,28 @@ $result_trees{'contain_plain_text_nestings'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -109,24 +122,27 @@ $result_trees{'contain_plain_text_nestings'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -666,12 +682,12 @@ $result_trees{'contain_plain_text_nestings'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'contain_plain_text_nestings'}{'contents'}[3];
-$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[4]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'contain_plain_text_nestings'}{'contents'}[3];
+$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[2]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'contain_plain_text_nestings'}{'contents'}[3];
+$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[5]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[5]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[5]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[5]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'contain_plain_text_nestings'}{'contents'}[4]{'contents'}[5]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'contain_plain_text_nestings'}{'contents'}[3];
 
 $result_texis{'contain_plain_text_nestings'} = '@node Top
 @top top
diff --git a/tp/t/results/coverage_braces/footnote_no_node.pl 
b/tp/t/results/coverage_braces/footnote_no_node.pl
index db2f00dd74..e3ec1145b1 100644
--- a/tp/t/results/coverage_braces/footnote_no_node.pl
+++ b/tp/t/results/coverage_braces/footnote_no_node.pl
@@ -11,24 +11,27 @@ $result_trees{'footnote_no_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 952397e617..130b24e310 100644
--- a/tp/t/results/coverage_braces/inforef_too_much_args.pl
+++ b/tp/t/results/coverage_braces/inforef_too_much_args.pl
@@ -11,24 +11,27 @@ $result_trees{'inforef_too_much_args'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -109,7 +112,7 @@ $result_trees{'inforef_too_much_args'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'inforef_too_much_args'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'inforef_too_much_args'} = '@node chapter
 
diff --git a/tp/t/results/coverage_braces/seeentry_no_braces.pl 
b/tp/t/results/coverage_braces/seeentry_no_braces.pl
index 05b2601931..6d7c8e7935 100644
--- a/tp/t/results/coverage_braces/seeentry_no_braces.pl
+++ b/tp/t/results/coverage_braces/seeentry_no_braces.pl
@@ -11,23 +11,28 @@ $result_trees{'seeentry_no_braces'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'seeentry_no_braces'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -77,23 +85,28 @@ $result_trees{'seeentry_no_braces'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -109,24 +122,27 @@ $result_trees{'seeentry_no_braces'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -225,7 +241,7 @@ $result_trees{'seeentry_no_braces'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'seeentry_no_braces'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'seeentry_no_braces'}{'contents'}[3];
+$result_trees{'seeentry_no_braces'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'seeentry_no_braces'}{'contents'}[3];
 
 $result_texis{'seeentry_no_braces'} = '@node Top
 @top top
diff --git a/tp/t/results/coverage_braces/test_image.pl 
b/tp/t/results/coverage_braces/test_image.pl
index 12d0240175..3a1e80354f 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -592,23 +592,28 @@ $result_trees{'test_image'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -623,24 +628,27 @@ $result_trees{'test_image'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'source_marks' => [
             {
@@ -2668,8 +2676,8 @@ $result_trees{'test_image'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[12]{'contents'}[6]{'extra'}{'float'}
 = $result_trees{'test_image'}{'contents'}[2]{'contents'}[12];
+$result_trees{'test_image'}{'contents'}[2]{'contents'}[12]{'extra'}{'caption'} 
= $result_trees{'test_image'}{'contents'}[2]{'contents'}[12]{'contents'}[6];
 
 $result_texis{'test_image'} = '@macro files-char
 @image{f@@i--le@/.@.  a@@<"%@@@verb{:  < & @ % " :} ,,,,.ext@@i--le@/.@.  
a@@<"%@@@verb{:  < & @ % " :}}
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 d6941b8cd8..f41378d004 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
@@ -16,23 +16,28 @@ $result_trees{'two_footnotes_in_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'two_footnotes_in_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '2 footnotes in 2 nodes'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => '2 footnotes in 2 nodes'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -291,23 +299,28 @@ $result_trees{'two_footnotes_in_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -322,24 +335,27 @@ $result_trees{'two_footnotes_in_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -467,7 +483,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'two_footnotes_in_nodes'} = '@node Top
 @top 2 footnotes in 2 nodes
diff --git a/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl 
b/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
index 263ea56622..9dc2ca2035 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
@@ -50,23 +50,28 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -81,24 +86,27 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '2 footnotes in 2 nodes'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => '2 footnotes in 2 nodes'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -325,23 +333,28 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -356,24 +369,27 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -501,7 +517,7 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'two_footnotes_in_nodes_separate'} = '@footnotestyle separate
 @node Top
diff --git 
a/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate_no_header.pl 
b/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate_no_header.pl
index d862723922..cb59c08e45 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate_no_header.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate_no_header.pl
@@ -50,23 +50,28 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'} 
= {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -81,24 +86,27 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '2 footnotes in 2 nodes'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => '2 footnotes in 2 nodes'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -325,23 +333,28 @@ 
$result_trees{'two_footnotes_in_nodes_separate_no_header'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -356,24 +369,27 @@ 
$result_trees{'two_footnotes_in_nodes_separate_no_header'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -501,7 +517,7 @@ $result_trees{'two_footnotes_in_nodes_separate_no_header'} 
= {
   ],
   'type' => 'document_root'
 };
-$result_trees{'two_footnotes_in_nodes_separate_no_header'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_footnotes_in_nodes_separate_no_header'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_footnotes_in_nodes_separate_no_header'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_footnotes_in_nodes_separate_no_header'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'two_footnotes_in_nodes_separate_no_header'} = '@footnotestyle 
separate
 @node Top
diff --git a/tp/t/results/def/all_commands_delimiters_printindex.pl 
b/tp/t/results/def/all_commands_delimiters_printindex.pl
index cd9fbad5d6..a762390fb0 100644
--- a/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -11,23 +11,28 @@ $result_trees{'all_commands_delimiters_printindex'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'all_commands_delimiters_printindex'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -14238,53 +14246,53 @@ $result_trees{'all_commands_delimiters_printindex'} = 
{
   ],
   'type' => 'document_root'
 };
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[29]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[35]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[37]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[39]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[53]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[55]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[57]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[59]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[61]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[63]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[65]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[67]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[69]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[71]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[73]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[75]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[77]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[79]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[81]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[83]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[85]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[87]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[89]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[91]{'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'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[12]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[14]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[16]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[18]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[20]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[22]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[24]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[26]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[28]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[30]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[32]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[34]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[36]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[38]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[40]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[42]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[44]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[46]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[48]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[50]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[52]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[54]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[56]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[58]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[60]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[62]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[64]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[66]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[68]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[70]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[72]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[74]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[76]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[78]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[80]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[82]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[84]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[86]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[88]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[90]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[92]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[2]{'contents'}[94]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[2];
 
 $result_texis{'all_commands_delimiters_printindex'} = '@node Top
 @node chap
diff --git a/tp/t/results/def/all_commands_printindex.pl 
b/tp/t/results/def/all_commands_printindex.pl
index 15e90dcb97..aa7eeeefc0 100644
--- a/tp/t/results/def/all_commands_printindex.pl
+++ b/tp/t/results/def/all_commands_printindex.pl
@@ -11,23 +11,28 @@ $result_trees{'all_commands_printindex'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'all_commands_printindex'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -5112,33 +5120,33 @@ $result_trees{'all_commands_printindex'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[29]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[35]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[37]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[39]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[41]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[43]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[45]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[47]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[49]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[51]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
-$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'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[12]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[14]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[16]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[18]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[20]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[22]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[24]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[26]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[28]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[30]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[32]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[34]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[36]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[38]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[40]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[42]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[44]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[46]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[48]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[50]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[52]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[2]{'contents'}[54]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[2];
 
 $result_texis{'all_commands_printindex'} = '@node Top
 @node chap
diff --git a/tp/t/results/def/omit_def_space.pl 
b/tp/t/results/def/omit_def_space.pl
index 98d1a420b7..641469e1f5 100644
--- a/tp/t/results/def/omit_def_space.pl
+++ b/tp/t/results/def/omit_def_space.pl
@@ -11,24 +11,27 @@ $result_trees{'omit_def_space'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -49,24 +52,27 @@ $result_trees{'omit_def_space'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -400,8 +406,8 @@ $result_trees{'omit_def_space'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'omit_def_space'}{'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'}[4]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'omit_def_space'}{'contents'}[2];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'omit_def_space'}{'contents'}[2];
 
 $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 8d4366b34d..45081b71a0 100644
--- a/tp/t/results/def/ref_in_def.pl
+++ b/tp/t/results/def/ref_in_def.pl
@@ -18,24 +18,27 @@ $result_trees{'ref_in_def'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -644,20 +647,20 @@ $result_trees{'ref_in_def'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'ref_in_def'}{'contents'}[1];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_index_element'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_index_element'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$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'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_index_element'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'ref_in_def'}{'contents'}[1];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'def_index_element'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'def_index_element'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'ref_in_def'}{'contents'}[1];
 
 $result_texis{'ref_in_def'} = '
 @node first
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 87df8151ea..5894c9e042 100644
--- a/tp/t/results/def/space_in_def_for_index.pl
+++ b/tp/t/results/def/space_in_def_for_index.pl
@@ -11,23 +11,28 @@ $result_trees{'space_in_def_for_index'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'space_in_def_for_index'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -408,8 +416,8 @@ $result_trees{'space_in_def_for_index'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'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'}{'element_node'}
 = $result_trees{'space_in_def_for_index'}{'contents'}[2];
+$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'space_in_def_for_index'}{'contents'}[2];
+$result_trees{'space_in_def_for_index'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'space_in_def_for_index'}{'contents'}[2];
 
 $result_texis{'space_in_def_for_index'} = '@node Top
 @node chap
diff --git a/tp/t/results/def/text_block_before_defline.pl 
b/tp/t/results/def/text_block_before_defline.pl
index 7208f5a4ec..6fb7271840 100644
--- a/tp/t/results/def/text_block_before_defline.pl
+++ b/tp/t/results/def/text_block_before_defline.pl
@@ -16,23 +16,28 @@ $result_trees{'text_block_before_defline'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'text_block_before_defline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'text_block_before_defline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapt'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapt'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapt'
@@ -113,24 +126,27 @@ $result_trees{'text_block_before_defline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -527,7 +543,7 @@ $result_trees{'text_block_before_defline'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'text_block_before_defline'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'text_block_before_defline'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'text_block_before_defline'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'text_block_before_defline'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'text_block_before_defline'} = '@node Top
 @top 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 297dc74119..bd2e9e58d4 100644
--- a/tp/t/results/docbook_tests/between_node_and_section.pl
+++ b/tp/t/results/docbook_tests/between_node_and_section.pl
@@ -18,23 +18,28 @@ $result_trees{'between_node_and_section'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -49,24 +54,27 @@ $result_trees{'between_node_and_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -86,23 +94,28 @@ $result_trees{'between_node_and_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sec1'
@@ -117,24 +130,27 @@ $result_trees{'between_node_and_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -154,24 +170,27 @@ $result_trees{'between_node_and_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'anchor',
           'contents' => [
@@ -212,23 +231,28 @@ $result_trees{'between_node_and_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {
         'section_number' => '1.2'
       },
diff --git a/tp/t/results/docbook_tests/multiple_documentlanguage.pl 
b/tp/t/results/docbook_tests/multiple_documentlanguage.pl
index f14f73a743..d8d77ff8d2 100644
--- a/tp/t/results/docbook_tests/multiple_documentlanguage.pl
+++ b/tp/t/results/docbook_tests/multiple_documentlanguage.pl
@@ -48,23 +48,28 @@ $result_trees{'multiple_documentlanguage'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -79,24 +84,27 @@ $result_trees{'multiple_documentlanguage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -114,23 +122,28 @@ $result_trees{'multiple_documentlanguage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -145,24 +158,27 @@ $result_trees{'multiple_documentlanguage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap no new language'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap no new language'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -212,23 +228,28 @@ $result_trees{'multiple_documentlanguage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter fr'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter fr'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-fr'
@@ -243,24 +264,27 @@ $result_trees{'multiple_documentlanguage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter fr'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter fr'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -310,23 +334,28 @@ $result_trees{'multiple_documentlanguage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subnode pt'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subnode pt'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'subnode-pt'
@@ -341,24 +370,27 @@ $result_trees{'multiple_documentlanguage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section pt'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section pt'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -408,23 +440,28 @@ $result_trees{'multiple_documentlanguage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subnode fr'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subnode fr'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'subnode-fr'
@@ -439,24 +476,27 @@ $result_trees{'multiple_documentlanguage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section fr'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section fr'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/docbook_tests/special_docbook_unnumbered.pl 
b/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
index 94222be7c0..9c5ed3b0ec 100644
--- a/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
+++ b/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
@@ -11,23 +11,28 @@ $result_trees{'special_docbook_unnumbered'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'special_docbook_unnumbered'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -332,23 +340,28 @@ $result_trees{'special_docbook_unnumbered'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Dedication'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Dedication'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Dedication'
@@ -363,24 +376,27 @@ $result_trees{'special_docbook_unnumbered'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'a dedication'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'a dedication'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -412,23 +428,28 @@ $result_trees{'special_docbook_unnumbered'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'preface'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'preface'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'preface'
@@ -443,24 +464,27 @@ $result_trees{'special_docbook_unnumbered'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'The Preface'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'The Preface'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -492,23 +516,28 @@ $result_trees{'special_docbook_unnumbered'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'colophon'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'colophon'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'colophon'
@@ -523,24 +552,27 @@ $result_trees{'special_docbook_unnumbered'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'A colophon'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'A colophon'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -572,23 +604,28 @@ $result_trees{'special_docbook_unnumbered'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'acknowledgements'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'acknowledgements'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'acknowledgements'
@@ -603,24 +640,27 @@ $result_trees{'special_docbook_unnumbered'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'A chapter Acnkowledgements'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'A chapter Acnkowledgements'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -651,10 +691,10 @@ $result_trees{'special_docbook_unnumbered'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'special_docbook_unnumbered'} = '@node Top
 @top top
diff --git a/tp/t/results/epub_tests/chapter_before_top_epub.pl 
b/tp/t/results/epub_tests/chapter_before_top_epub.pl
index 9a00c90af0..aac4e9816e 100644
--- a/tp/t/results/epub_tests/chapter_before_top_epub.pl
+++ b/tp/t/results/epub_tests/chapter_before_top_epub.pl
@@ -16,24 +16,27 @@ $result_trees{'chapter_before_top_epub'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -54,23 +57,28 @@ $result_trees{'chapter_before_top_epub'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -85,24 +93,27 @@ $result_trees{'chapter_before_top_epub'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -122,24 +133,27 @@ $result_trees{'chapter_before_top_epub'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -157,23 +171,28 @@ $result_trees{'chapter_before_top_epub'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'top',
       'extra' => {
         'associated_part' => {}
       },
diff --git a/tp/t/results/epub_tests/section_part_epub.pl 
b/tp/t/results/epub_tests/section_part_epub.pl
index def4ce7f50..28d02eb95d 100644
--- a/tp/t/results/epub_tests/section_part_epub.pl
+++ b/tp/t/results/epub_tests/section_part_epub.pl
@@ -16,23 +16,28 @@ $result_trees{'section_part_epub'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'section_part_epub'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -84,23 +92,28 @@ $result_trees{'section_part_epub'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'part',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
diff --git a/tp/t/results/epub_tests/setfilename_on_top_and_after_node_epub.pl 
b/tp/t/results/epub_tests/setfilename_on_top_and_after_node_epub.pl
index f68e0f1766..f719bd0c1c 100644
--- a/tp/t/results/epub_tests/setfilename_on_top_and_after_node_epub.pl
+++ b/tp/t/results/epub_tests/setfilename_on_top_and_after_node_epub.pl
@@ -16,23 +16,28 @@ $result_trees{'setfilename_on_top_and_after_node_epub'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,48 +52,51 @@ $result_trees{'setfilename_on_top_and_after_node_epub'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'In top '
-            },
-            {
-              'args' => [
+              'contents' => [
+                {
+                  'text' => 'In top '
+                },
                 {
-                  'contents' => [
+                  'args' => [
                     {
-                      'text' => 'very badly placed setfilename'
+                      'contents' => [
+                        {
+                          'text' => 'very badly placed setfilename'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_after_argument' => {
+                          'text' => '
+'
+                        }
+                      },
+                      'type' => 'line_arg'
                     }
                   ],
+                  'cmdname' => 'setfilename',
+                  'extra' => {
+                    'text_arg' => 'very badly placed setfilename'
+                  },
                   'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
-'
+                    'spaces_before_argument' => {
+                      'text' => ' '
                     }
                   },
-                  'type' => 'line_arg'
+                  'source_info' => {
+                    'line_nr' => 2
+                  }
                 }
               ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'text_arg' => 'very badly placed setfilename'
-              },
-              'info' => {
-                'spaces_before_argument' => {
-                  'text' => ' '
-                }
-              },
-              'source_info' => {
-                'line_nr' => 2
-              }
+              'type' => 'line_arg'
             }
           ],
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/float/anchor_in_caption.pl 
b/tp/t/results/float/anchor_in_caption.pl
index 48acd114d6..d75425d8c8 100644
--- a/tp/t/results/float/anchor_in_caption.pl
+++ b/tp/t/results/float/anchor_in_caption.pl
@@ -16,23 +16,28 @@ $result_trees{'anchor_in_caption'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'anchor_in_caption'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -259,8 +267,8 @@ $result_trees{'anchor_in_caption'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'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'}[2];
+$result_trees{'anchor_in_caption'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'extra'}{'float'}
 = $result_trees{'anchor_in_caption'}{'contents'}[2]{'contents'}[4];
+$result_trees{'anchor_in_caption'}{'contents'}[2]{'contents'}[4]{'extra'}{'caption'}
 = 
$result_trees{'anchor_in_caption'}{'contents'}[2]{'contents'}[4]{'contents'}[2];
 
 $result_texis{'anchor_in_caption'} = '@node Top
 @node chap
diff --git a/tp/t/results/float/cindex_in_caption.pl 
b/tp/t/results/float/cindex_in_caption.pl
index 1f6c6e9658..263476ca54 100644
--- a/tp/t/results/float/cindex_in_caption.pl
+++ b/tp/t/results/float/cindex_in_caption.pl
@@ -16,23 +16,28 @@ $result_trees{'cindex_in_caption'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'cindex_in_caption'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -319,9 +327,9 @@ $result_trees{'cindex_in_caption'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'cindex_in_caption'}{'contents'}[2];
-$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'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'}[2];
+$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'cindex_in_caption'}{'contents'}[2];
+$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'extra'}{'float'}
 = $result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[4];
+$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[4]{'extra'}{'caption'}
 = 
$result_trees{'cindex_in_caption'}{'contents'}[2]{'contents'}[4]{'contents'}[2];
 
 $result_texis{'cindex_in_caption'} = '@node Top
 @node chap
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 914f7ca8b2..2a3332f5db 100644
--- a/tp/t/results/float/comment_space_comand_in_float.pl
+++ b/tp/t/results/float/comment_space_comand_in_float.pl
@@ -16,23 +16,28 @@ $result_trees{'comment_space_comand_in_float'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'comment_space_comand_in_float'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/float/complex_float.pl 
b/tp/t/results/float/complex_float.pl
index 24d63ea088..b5e33bf815 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -16,23 +16,28 @@ $result_trees{'complex_float'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'complex_float'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Test floats'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Test floats'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2196,23 +2204,28 @@ $result_trees{'complex_float'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -2227,24 +2240,27 @@ $result_trees{'complex_float'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'A chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'A chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3336,28 +3352,28 @@ $result_trees{'complex_float'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'complex_float'}{'contents'}[1];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[8]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[11]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'contents'}[0]{'contents'}[7]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'contents'}[0]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'contents'}[0]{'contents'}[11]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'complex_float'}{'contents'}[1];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'contents'}[0]{'contents'}[14]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'contents'}[0]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'contents'}[0]{'contents'}[16]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'contents'}[0]{'contents'}[16]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'extra'}{'float'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
-$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'}{'shortcaption'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[20];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[8]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'complex_float'}{'contents'}[3];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[11]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[16]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[16]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'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'}[4];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'extra'}{'float_section'}
 = $result_trees{'complex_float'}{'contents'}[4];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[5]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'complex_float'}{'contents'}[1];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[8]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[11]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[17]{'contents'}[0]{'contents'}[7]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[17]{'contents'}[0]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[17]{'contents'}[0]{'contents'}[11]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'complex_float'}{'contents'}[1];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[17]{'contents'}[0]{'contents'}[14]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[17]{'contents'}[0]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[17]{'contents'}[0]{'contents'}[16]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[17]{'contents'}[0]{'contents'}[16]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[17]{'extra'}{'float'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[8];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[20]{'extra'}{'float'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[8];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'extra'}{'caption'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[17];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'extra'}{'float_section'}
 = $result_trees{'complex_float'}{'contents'}[2];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'extra'}{'shortcaption'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[20];
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[8]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'complex_float'}{'contents'}[3];
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[11]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[16]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[16]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'extra'}{'float'}
 = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[2];
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[2]{'extra'}{'caption'}
 = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[2]{'contents'}[4];
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[2]{'extra'}{'float_section'}
 = $result_trees{'complex_float'}{'contents'}[4];
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'complex_float'} = '@node Top
 @top Test floats
diff --git a/tp/t/results/float/float_copying.pl 
b/tp/t/results/float/float_copying.pl
index bd208d93e4..ec236bb879 100644
--- a/tp/t/results/float/float_copying.pl
+++ b/tp/t/results/float/float_copying.pl
@@ -500,23 +500,28 @@ $result_trees{'float_copying'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -531,24 +536,27 @@ $result_trees{'float_copying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -688,23 +696,28 @@ $result_trees{'float_copying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Copying and floats'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Copying and floats'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -720,24 +733,27 @@ $result_trees{'float_copying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Copying and floats'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Copying and floats'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -894,7 +910,7 @@ $result_trees{'float_copying'} = {
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'extra'}{'float'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'caption'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4];
-$result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'float_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'float_copying'} = '@copying
 
diff --git a/tp/t/results/float/footnote_in_caption.pl 
b/tp/t/results/float/footnote_in_caption.pl
index 190fc6db7e..99730bc824 100644
--- a/tp/t/results/float/footnote_in_caption.pl
+++ b/tp/t/results/float/footnote_in_caption.pl
@@ -16,23 +16,28 @@ $result_trees{'footnote_in_caption'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'footnote_in_caption'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -261,8 +269,8 @@ $result_trees{'footnote_in_caption'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'footnote_in_caption'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'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'}[2];
+$result_trees{'footnote_in_caption'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'extra'}{'float'}
 = $result_trees{'footnote_in_caption'}{'contents'}[2]{'contents'}[4];
+$result_trees{'footnote_in_caption'}{'contents'}[2]{'contents'}[4]{'extra'}{'caption'}
 = 
$result_trees{'footnote_in_caption'}{'contents'}[2]{'contents'}[4]{'contents'}[2];
 
 $result_texis{'footnote_in_caption'} = '@node Top
 @node chap
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 7747fdb78f..ba143cda0e 100644
--- a/tp/t/results/float/footnote_in_caption_and_error.pl
+++ b/tp/t/results/float/footnote_in_caption_and_error.pl
@@ -16,23 +16,28 @@ $result_trees{'footnote_in_caption_and_error'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'footnote_in_caption_and_error'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -267,8 +275,8 @@ $result_trees{'footnote_in_caption_and_error'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'footnote_in_caption_and_error'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'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'}[2];
+$result_trees{'footnote_in_caption_and_error'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'extra'}{'float'}
 = $result_trees{'footnote_in_caption_and_error'}{'contents'}[2]{'contents'}[4];
+$result_trees{'footnote_in_caption_and_error'}{'contents'}[2]{'contents'}[4]{'extra'}{'caption'}
 = 
$result_trees{'footnote_in_caption_and_error'}{'contents'}[2]{'contents'}[4]{'contents'}[2];
 
 $result_texis{'footnote_in_caption_and_error'} = '@node Top
 @node chap
diff --git a/tp/t/results/float/numbering_captions_listoffloats.pl 
b/tp/t/results/float/numbering_captions_listoffloats.pl
index d6558ee168..37f19cc654 100644
--- a/tp/t/results/float/numbering_captions_listoffloats.pl
+++ b/tp/t/results/float/numbering_captions_listoffloats.pl
@@ -16,23 +16,28 @@ $result_trees{'numbering_captions_listoffloats'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'numbering_captions_listoffloats'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Test floats'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Test floats'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1453,23 +1461,28 @@ $result_trees{'numbering_captions_listoffloats'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -1484,24 +1497,27 @@ $result_trees{'numbering_captions_listoffloats'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'A chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'A chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2432,23 +2448,28 @@ $result_trees{'numbering_captions_listoffloats'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -2463,24 +2484,27 @@ $result_trees{'numbering_captions_listoffloats'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'A section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'A section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2603,23 +2627,28 @@ $result_trees{'numbering_captions_listoffloats'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Unnumbered'
@@ -2634,24 +2663,27 @@ $result_trees{'numbering_captions_listoffloats'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3070,23 +3102,28 @@ $result_trees{'numbering_captions_listoffloats'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section within unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section within unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Section-within-unnumbered'
@@ -3101,24 +3138,27 @@ $result_trees{'numbering_captions_listoffloats'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section within unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section within unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3294,23 +3334,28 @@ $result_trees{'numbering_captions_listoffloats'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter with unnumbsubsec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter with unnumbsubsec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Chapter-with-unnumbsubsec'
@@ -3325,24 +3370,27 @@ $result_trees{'numbering_captions_listoffloats'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter with unnumbsubsec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter with unnumbsubsec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3613,23 +3661,28 @@ $result_trees{'numbering_captions_listoffloats'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered sec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered sec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumbered-sec'
@@ -3644,24 +3697,27 @@ $result_trees{'numbering_captions_listoffloats'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered sec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered sec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3982,23 +4038,28 @@ $result_trees{'numbering_captions_listoffloats'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Appendix for float'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Appendix for float'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Appendix-for-float'
@@ -4013,24 +4074,27 @@ $result_trees{'numbering_captions_listoffloats'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Appendix for float'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Appendix for float'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -4208,23 +4272,28 @@ $result_trees{'numbering_captions_listoffloats'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'list of floats'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'list of floats'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'list-of-floats'
@@ -4239,24 +4308,27 @@ $result_trees{'numbering_captions_listoffloats'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'list of floats'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'list of floats'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -4776,108 +4848,108 @@ $result_trees{'numbering_captions_listoffloats'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'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'}[2];
-$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'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[4];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[5]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[3];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[5];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[5]{'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'}[3];
-$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'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[5];
-$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'}[11]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[4]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[4];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[5]{'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'}[3];
-$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'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[5];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[5]{'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'}[3];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[5];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'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'}[3];
-$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'}[3]{'contents'}[1]{'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'}[1];
-$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'}[5]{'contents'}[3]{'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'}[3];
-$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'}[7]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'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'}[3];
-$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'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[5];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'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'}[3];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[5];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[6];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[4]{'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'}[4];
-$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'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[5]{'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'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[2]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[2]{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[2]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[2]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[2]{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[4]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[4]{'contents'}[5]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[4]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[4]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[4]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[4]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[4]{'contents'}[5];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[6]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[6];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[6]{'contents'}[5]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[6];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[6]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[6]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[6]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[6]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[6]{'contents'}[5];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[9]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[12]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[14];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[14]{'contents'}[4]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[14];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[14]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[14]{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[14]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[14]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[14]{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[16]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[16];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[16]{'contents'}[5]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[16];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[16]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[16]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[16]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[16]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[16]{'contents'}[5];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[18]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[18];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[18]{'contents'}[5]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[18];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[18]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[18]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[18]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[18]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[18]{'contents'}[5];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[20]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[20]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[20]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[20]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[20]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[20]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[20]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[20]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[2]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[2]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[2]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[2]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[4]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[4]{'contents'}[1];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[4]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[6];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[6]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[6]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[6]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[8]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[8];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[8]{'contents'}[5]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[8];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[8]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[8]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[8]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[8]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[8]{'contents'}[5];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[10]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[10];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[10]{'contents'}[5]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[10];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[10]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[10]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[10]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[10]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[10]{'contents'}[5];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[12]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[2]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[6];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$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'}[4];
 
$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'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[5];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[4]{'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'}[4];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[4]{'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'}[4];
-$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'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[4]{'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'}[4];
-$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'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[5]{'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'}[3];
-$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'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[5];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[5]{'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'}[5];
-$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'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[3];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[4]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[4]{'contents'}[5]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[4]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[4]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[4]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[4]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[4]{'contents'}[5];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[3]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[3]{'contents'}[4]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[3]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[3]{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[3]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[3]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[3]{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[3]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[3]{'contents'}[4]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[3]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[3]{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[3]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[3]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[3]{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[2]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[2]{'contents'}[4]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[2]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[2]{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[2]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[2]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[2]{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[4]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[4]{'contents'}[5]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[4];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[4]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[4]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[4]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[4]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[4]{'contents'}[5];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[2]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[2]{'contents'}[5]{'extra'}{'float'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[2];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[2]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[2]{'contents'}[5];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[2]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[2]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[2]{'contents'}[3];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[18]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'numbering_captions_listoffloats'} = '@node Top
 @top Test floats
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 4db0715fe9..1739a9a861 100644
--- a/tp/t/results/float/special_characters_in_float_type.pl
+++ b/tp/t/results/float/special_characters_in_float_type.pl
@@ -16,23 +16,28 @@ $result_trees{'special_characters_in_float_type'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'special_characters_in_float_type'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'special_characters_in_float_type'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -113,24 +126,27 @@ $result_trees{'special_characters_in_float_type'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -393,9 +409,9 @@ $result_trees{'special_characters_in_float_type'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'special_characters_in_float_type'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'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'}[2];
-$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'}[2]{'contents'}[2]{'extra'}{'float'}
 = 
$result_trees{'special_characters_in_float_type'}{'contents'}[4]{'contents'}[2];
+$result_trees{'special_characters_in_float_type'}{'contents'}[4]{'contents'}[2]{'extra'}{'caption'}
 = 
$result_trees{'special_characters_in_float_type'}{'contents'}[4]{'contents'}[2]{'contents'}[2];
+$result_trees{'special_characters_in_float_type'}{'contents'}[4]{'contents'}[2]{'extra'}{'float_section'}
 = $result_trees{'special_characters_in_float_type'}{'contents'}[4];
 
 $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 8bf3f8a83d..e6310bd81f 100644
--- a/tp/t/results/formats_encodings/accent.pl
+++ b/tp/t/results/formats_encodings/accent.pl
@@ -16,23 +16,28 @@ $result_trees{'accent'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'first'
@@ -47,24 +52,27 @@ $result_trees{'accent'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/formats_encodings/accent_argument_non_ascii.pl 
b/tp/t/results/formats_encodings/accent_argument_non_ascii.pl
index dc7be39711..2eb9aae9b3 100644
--- a/tp/t/results/formats_encodings/accent_argument_non_ascii.pl
+++ b/tp/t/results/formats_encodings/accent_argument_non_ascii.pl
@@ -16,23 +16,28 @@ $result_trees{'accent_argument_non_ascii'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'accent_argument_non_ascii'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'accent_argument_non_ascii'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -113,24 +126,27 @@ $result_trees{'accent_argument_non_ascii'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
diff --git a/tp/t/results/formats_encodings/accent_enable_encoding.pl 
b/tp/t/results/formats_encodings/accent_enable_encoding.pl
index 43bf3d9429..b51ba8ad82 100644
--- a/tp/t/results/formats_encodings/accent_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accent_enable_encoding.pl
@@ -16,23 +16,28 @@ $result_trees{'accent_enable_encoding'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'first'
@@ -47,24 +52,27 @@ $result_trees{'accent_enable_encoding'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/formats_encodings/accentenc.pl 
b/tp/t/results/formats_encodings/accentenc.pl
index 9e1421d9bc..f94d2adc4b 100644
--- a/tp/t/results/formats_encodings/accentenc.pl
+++ b/tp/t/results/formats_encodings/accentenc.pl
@@ -54,23 +54,28 @@ $result_trees{'accentenc'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'first'
@@ -85,24 +90,27 @@ $result_trees{'accentenc'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/formats_encodings/accentenc_enable_encoding.pl 
b/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
index b3dcfbfb7a..066008a371 100644
--- a/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accentenc_enable_encoding.pl
@@ -49,23 +49,28 @@ $result_trees{'accentenc_enable_encoding'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'first'
@@ -80,24 +85,27 @@ $result_trees{'accentenc_enable_encoding'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 2a91645fad..ee610ad46e 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs.pl
@@ -16,23 +16,28 @@ $result_trees{'at_commands_in_refs'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3624,35 +3632,40 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => '-'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '{'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '}'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'cmdname' => '-'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '{'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '}'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '-_007b-_007d'
@@ -3667,36 +3680,39 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => '-'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '{'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '}'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'cmdname' => '-'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '{'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '}'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3716,71 +3732,76 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => ' '
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '   '
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '!'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '*'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '.'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => ':'
-            },
-            {
-              'text' => ' .'
-            },
-            {
-              'cmdname' => ':'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '?'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '@'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'cmdname' => ' '
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '       '
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '!'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '*'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '.'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => ':'
+                },
+                {
+                  'text' => ' .'
+                },
+                {
+                  'cmdname' => ':'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '?'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '@'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '-_0021-_002e-_002e-_003f-_0040'
@@ -3795,172 +3816,180 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'cmdname' => ' '
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '   '
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '!'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '*'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '.'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => ':'
-            },
-            {
-              'text' => ' .'
-            },
-            {
-              'cmdname' => ':'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '?'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '@'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
       'cmdname' => 'chapter',
       'contents' => [
-        {
-          'text' => '
-',
-          'type' => 'empty_line'
-        }
-      ],
-      'extra' => {
-        'section_number' => '2'
-      },
-      'info' => {
-        'spaces_before_argument' => {
-          'text' => ' '
-        }
-      },
-      'source_info' => {
-        'line_nr' => 38
-      }
-    },
-    {
-      'args' => [
         {
           'contents' => [
             {
-              'cmdname' => 'atchar',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 40
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'lbracechar',
-              'contents' => [
+                  'cmdname' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 40
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'rbracechar',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 40
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'backslashchar',
-              'contents' => [
+                  'cmdname' => '       '
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '!'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '*'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '.'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => ':'
+                },
+                {
+                  'text' => ' .'
+                },
+                {
+                  'cmdname' => ':'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '?'
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => '@'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 40
-              }
-            },
-            {
-              'text' => ' '
-            },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
+              },
+              'type' => 'line_arg'
+            }
+          ],
+          'type' => 'argument'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        }
+      ],
+      'extra' => {
+        'section_number' => '2'
+      },
+      'info' => {
+        'spaces_before_argument' => {
+          'text' => ' '
+        }
+      },
+      'source_info' => {
+        'line_nr' => 38
+      }
+    },
+    {
+      'cmdname' => 'node',
+      'contents' => [
+        {
+          'contents' => [
             {
-              'cmdname' => 'hashchar',
               'contents' => [
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'atchar',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 40
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'lbracechar',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 40
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'rbracechar',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 40
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'backslashchar',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 40
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'hashchar',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 40
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 40
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_0040-_007b-_007d-_005c-_0023'
@@ -3975,88 +4004,91 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'atchar',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 41
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'lbracechar',
-              'contents' => [
+                  'cmdname' => 'atchar',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 41
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 41
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'rbracechar',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 41
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'backslashchar',
-              'contents' => [
+                  'cmdname' => 'lbracechar',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 41
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 41
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'hashchar',
-              'contents' => [
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'rbracechar',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 41
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'backslashchar',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 41
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'hashchar',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 41
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 41
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -4076,115 +4108,120 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'LaTeX',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 43
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'TeX',
-              'contents' => [
+                  'cmdname' => 'LaTeX',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 43
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 43
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'bullet',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 43
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'comma',
-              'contents' => [
+                  'cmdname' => 'TeX',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 43
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 43
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'copyright',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 43
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'dots',
-              'contents' => [
+                  'cmdname' => 'bullet',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 43
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 43
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'enddots',
-              'contents' => [
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'comma',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 43
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'copyright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 43
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'dots',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 43
+                  }
+                },
                 {
-                  'type' => 'brace_container'
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'enddots',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 43
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 43
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
@@ -4199,116 +4236,119 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'LaTeX',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 44
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'TeX',
-              'contents' => [
+                  'cmdname' => 'LaTeX',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 44
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 44
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'bullet',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 44
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'comma',
-              'contents' => [
+                  'cmdname' => 'TeX',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 44
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 44
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'copyright',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 44
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'dots',
-              'contents' => [
+                  'cmdname' => 'bullet',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 44
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 44
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'enddots',
-              'contents' => [
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'comma',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 44
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'copyright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 44
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'dots',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 44
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'enddots',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 44
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 44
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -4328,101 +4368,106 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
-        {
+      'cmdname' => 'node',
+      'contents' => [
+        {
           'contents' => [
             {
-              'cmdname' => 'equiv',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 46
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'error',
-              'contents' => [
+                  'cmdname' => 'equiv',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 46
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 46
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'euro',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 46
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'exclamdown',
-              'contents' => [
+                  'cmdname' => 'error',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 46
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 46
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'expansion',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 46
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'minus',
-              'contents' => [
+                  'cmdname' => 'euro',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 46
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'exclamdown',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 46
+                  }
+                },
                 {
-                  'type' => 'brace_container'
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'expansion',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 46
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'minus',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 46
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 46
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
@@ -4437,102 +4482,105 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'equiv',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 47
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'error',
-              'contents' => [
+                  'cmdname' => 'equiv',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 47
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 47
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'euro',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 47
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'exclamdown',
-              'contents' => [
+                  'cmdname' => 'error',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 47
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 47
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'expansion',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 47
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'minus',
-              'contents' => [
+                  'cmdname' => 'euro',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 47
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'exclamdown',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 47
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'expansion',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 47
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'minus',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 47
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 47
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -4552,59 +4600,64 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'geq',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 49
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'leq',
-              'contents' => [
+                  'cmdname' => 'geq',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 49
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 49
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'arrow',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 49
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                  'cmdname' => 'leq',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 49
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'arrow',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 49
+                  }
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_2265-_2264-_2192'
@@ -4619,60 +4672,63 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'geq',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 50
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'leq',
-              'contents' => [
+                  'cmdname' => 'geq',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 50
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 50
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'arrow',
-              'contents' => [
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'leq',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 50
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'arrow',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 50
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 50
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -4692,115 +4748,120 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'ordf',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 52
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ordm',
-              'contents' => [
+                  'cmdname' => 'ordf',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 52
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 52
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'point',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 52
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'pounds',
-              'contents' => [
+                  'cmdname' => 'ordm',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 52
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 52
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'print',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 52
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'questiondown',
-              'contents' => [
+                  'cmdname' => 'point',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 52
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 52
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'registeredsymbol',
-              'contents' => [
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'pounds',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 52
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'print',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 52
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'questiondown',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 52
+                  }
+                },
                 {
-                  'type' => 'brace_container'
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'registeredsymbol',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 52
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 52
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae'
@@ -4815,116 +4876,119 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'ordf',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 53
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ordm',
-              'contents' => [
+                  'cmdname' => 'ordf',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 53
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 53
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'point',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 53
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'pounds',
-              'contents' => [
+                  'cmdname' => 'ordm',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 53
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 53
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'print',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 53
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'questiondown',
-              'contents' => [
+                  'cmdname' => 'point',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 53
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 53
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'registeredsymbol',
-              'contents' => [
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'pounds',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 53
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'print',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 53
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'questiondown',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 53
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'registeredsymbol',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 53
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 53
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -4944,87 +5008,92 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'result',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 55
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'textdegree',
-              'contents' => [
+                  'cmdname' => 'result',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 55
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 55
-              }
-            },
-            {
-              'text' => ' a'
-            },
-            {
-              'cmdname' => 'tie',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 55
-              }
-            },
-            {
-              'text' => 'b '
-            },
-            {
-              'cmdname' => 'today',
-              'contents' => [
+                  'cmdname' => 'textdegree',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 55
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 55
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'aa',
-              'contents' => [
+                  'text' => ' a'
+                },
+                {
+                  'cmdname' => 'tie',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 55
+                  }
+                },
+                {
+                  'text' => 'b '
+                },
+                {
+                  'cmdname' => 'today',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 55
+                  }
+                },
                 {
-                  'type' => 'brace_container'
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'aa',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 55
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 55
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_21d2-_00b0-a-b-_00e5'
@@ -5039,88 +5108,91 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'result',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 56
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'textdegree',
-              'contents' => [
+                  'cmdname' => 'result',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 56
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 56
-              }
-            },
-            {
-              'text' => ' a'
-            },
-            {
-              'cmdname' => 'tie',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 56
-              }
-            },
-            {
-              'text' => 'b '
-            },
-            {
-              'cmdname' => 'today',
-              'contents' => [
+                  'cmdname' => 'textdegree',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 56
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 56
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'aa',
-              'contents' => [
+                  'text' => ' a'
+                },
+                {
+                  'cmdname' => 'tie',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 56
+                  }
+                },
+                {
+                  'text' => 'b '
+                },
+                {
+                  'cmdname' => 'today',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 56
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'aa',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 56
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 56
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -5140,435 +5212,443 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'AA',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 58
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ae',
-              'contents' => [
+                  'cmdname' => 'AA',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 58
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 58
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'oe',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 58
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'AE',
-              'contents' => [
+                  'cmdname' => 'ae',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 58
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 58
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'OE',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 58
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'o',
-              'contents' => [
+                  'cmdname' => 'oe',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 58
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 58
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'O',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 58
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ss',
-              'contents' => [
+                  'cmdname' => 'AE',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 58
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 58
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'l',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 58
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'L',
-              'contents' => [
+                  'cmdname' => 'OE',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 58
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 58
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'DH',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 58
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'dh',
-              'contents' => [
+                  'cmdname' => 'o',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 58
+                  }
+                },
                 {
-                  'type' => 'brace_container'
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'O',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 58
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'ss',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 58
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'l',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 58
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'L',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 58
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'DH',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 58
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'dh',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 58
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'TH',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 58
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'th',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 58
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 58
-              }
-            },
-            {
-              'text' => ' '
-            },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => ' 
+'
+                }
+              },
+              'type' => 'line_arg'
+            }
+          ],
+          'type' => 'argument'
+        }
+      ],
+      'extra' => {
+        'is_target' => 1,
+        'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
+      },
+      'info' => {
+        'spaces_before_argument' => {
+          'text' => ' '
+        }
+      },
+      'source_info' => {
+        'line_nr' => 58
+      }
+    },
+    {
+      'cmdname' => 'chapter',
+      'contents' => [
+        {
+          'contents' => [
             {
-              'cmdname' => 'TH',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 58
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'th',
-              'contents' => [
+                  'cmdname' => 'AA',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 59
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'ae',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 59
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'oe',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 59
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'AE',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 59
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'OE',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 59
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'o',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 59
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 58
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => ' 
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'extra' => {
-        'is_target' => 1,
-        'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
-      },
-      'info' => {
-        'spaces_before_argument' => {
-          'text' => ' '
-        }
-      },
-      'source_info' => {
-        'line_nr' => 58
-      }
-    },
-    {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'cmdname' => 'AA',
-              'contents' => [
+                  'cmdname' => 'O',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 59
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 59
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ae',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 59
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'oe',
-              'contents' => [
+                  'cmdname' => 'ss',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 59
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 59
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'AE',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 59
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'OE',
-              'contents' => [
+                  'cmdname' => 'l',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 59
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 59
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'o',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 59
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'O',
-              'contents' => [
+                  'cmdname' => 'L',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 59
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 59
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ss',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 59
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'l',
-              'contents' => [
+                  'cmdname' => 'DH',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 59
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 59
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'L',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 59
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'DH',
-              'contents' => [
+                  'cmdname' => 'dh',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 59
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 59
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'dh',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 59
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'TH',
-              'contents' => [
+                  'cmdname' => 'TH',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 59
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 59
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'th',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'th',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 59
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 59
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => ' 
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => ' 
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -5588,239 +5668,244 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => '"',
               'contents' => [
                 {
+                  'cmdname' => '"',
                   'contents' => [
                     {
-                      'text' => 'a'
-                    }
-                  ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '~',
-              'contents' => [
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '~',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '^',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '^',
                   'contents' => [
                     {
-                      'cmdname' => 'dotless',
                       'contents' => [
                         {
+                          'cmdname' => 'dotless',
                           'contents' => [
                             {
-                              'text' => 'i'
+                              'contents' => [
+                                {
+                                  'text' => 'i'
+                                }
+                              ],
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'brace_container'
+                          'source_info' => {
+                            'line_nr' => 61
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 61
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '^',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '^',
                   'contents' => [
                     {
-                      'text' => 'a'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '`',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '`',
                   'contents' => [
                     {
-                      'text' => 'a'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '\'',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '\'',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'following_arg'
                     }
                   ],
-                  'type' => 'following_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => ',',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => ',',
                   'contents' => [
                     {
-                      'text' => 'c'
+                      'contents' => [
+                        {
+                          'text' => 'c'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '=',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '=',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ringaccent',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'ringaccent',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'H',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'H',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ogonek',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'ogonek',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
@@ -5835,240 +5920,243 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => '"',
               'contents' => [
                 {
+                  'cmdname' => '"',
                   'contents' => [
                     {
-                      'text' => 'a'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '~',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '~',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '^',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '^',
                   'contents' => [
                     {
-                      'cmdname' => 'dotless',
                       'contents' => [
                         {
+                          'cmdname' => 'dotless',
                           'contents' => [
                             {
-                              'text' => 'i'
+                              'contents' => [
+                                {
+                                  'text' => 'i'
+                                }
+                              ],
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'brace_container'
+                          'source_info' => {
+                            'line_nr' => 62
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 62
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '^',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '^',
                   'contents' => [
                     {
-                      'text' => 'a'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '`',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '`',
                   'contents' => [
                     {
-                      'text' => 'a'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '\'',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '\'',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'following_arg'
                     }
                   ],
-                  'type' => 'following_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => ',',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => ',',
                   'contents' => [
                     {
-                      'text' => 'c'
+                      'contents' => [
+                        {
+                          'text' => 'c'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '=',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '=',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ringaccent',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'ringaccent',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'H',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'H',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ogonek',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'ogonek',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -6088,150 +6176,155 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'dotaccent',
               'contents' => [
                 {
+                  'cmdname' => 'dotaccent',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 64
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'u',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 64
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'u',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 64
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ubaraccent',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 64
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'ubaraccent',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 64
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'udotaccent',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 64
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'udotaccent',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 64
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'v',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 64
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'v',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 64
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'dotless',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 64
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'dotless',
                   'contents' => [
                     {
-                      'text' => 'j'
+                      'contents' => [
+                        {
+                          'text' => 'j'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 64
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'tieaccent',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 64
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'tieaccent',
                   'contents' => [
                     {
-                      'text' => 'ee'
+                      'contents' => [
+                        {
+                          'text' => 'ee'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 64
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 64
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
@@ -6246,151 +6339,154 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'dotaccent',
               'contents' => [
                 {
+                  'cmdname' => 'dotaccent',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 65
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'u',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 65
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'u',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 65
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ubaraccent',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 65
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'ubaraccent',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 65
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'udotaccent',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 65
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'udotaccent',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 65
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'v',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 65
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'v',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 65
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'dotless',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 65
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'dotless',
                   'contents' => [
                     {
-                      'text' => 'j'
+                      'contents' => [
+                        {
+                          'text' => 'j'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 65
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'tieaccent',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 65
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'tieaccent',
                   'contents' => [
                     {
-                      'text' => 'ee'
+                      'contents' => [
+                        {
+                          'text' => 'ee'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 65
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 65
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -6410,100 +6506,105 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'dotless',
               'contents' => [
                 {
+                  'cmdname' => 'dotless',
                   'contents' => [
                     {
-                      'text' => 'i'
+                      'contents' => [
+                        {
+                          'text' => 'i'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 67
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '`',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 67
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '`',
                   'contents' => [
                     {
-                      'cmdname' => '=',
                       'contents' => [
                         {
+                          'cmdname' => '=',
                           'contents' => [
                             {
-                              'text' => 'E'
+                              'contents' => [
+                                {
+                                  'text' => 'E'
+                                }
+                              ],
+                              'type' => 'following_arg'
                             }
                           ],
-                          'type' => 'following_arg'
+                          'source_info' => {
+                            'line_nr' => 67
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 67
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 67
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => ',',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 67
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => ',',
                   'contents' => [
                     {
-                      'cmdname' => '\'',
                       'contents' => [
                         {
+                          'cmdname' => '\'',
                           'contents' => [
                             {
-                              'text' => 'C'
+                              'contents' => [
+                                {
+                                  'text' => 'C'
+                                }
+                              ],
+                              'type' => 'following_arg'
                             }
                           ],
-                          'type' => 'following_arg'
+                          'source_info' => {
+                            'line_nr' => 67
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 67
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 67
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 67
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_0131-_1e14-_1e08'
@@ -6518,101 +6619,104 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'dotless',
               'contents' => [
                 {
+                  'cmdname' => 'dotless',
                   'contents' => [
                     {
-                      'text' => 'i'
+                      'contents' => [
+                        {
+                          'text' => 'i'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 68
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '`',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 68
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '`',
                   'contents' => [
                     {
-                      'cmdname' => '=',
                       'contents' => [
                         {
+                          'cmdname' => '=',
                           'contents' => [
                             {
-                              'text' => 'E'
+                              'contents' => [
+                                {
+                                  'text' => 'E'
+                                }
+                              ],
+                              'type' => 'following_arg'
                             }
-                          ],
-                          'type' => 'following_arg'
-                        }
-                      ],
-                      'source_info' => {
-                        'line_nr' => 68
-                      }
-                    }
-                  ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 68
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => ',',
-              'contents' => [
+                          ],
+                          'source_info' => {
+                            'line_nr' => 68
+                          }
+                        }
+                      ],
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 68
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => ',',
                   'contents' => [
                     {
-                      'cmdname' => '\'',
                       'contents' => [
                         {
+                          'cmdname' => '\'',
                           'contents' => [
                             {
-                              'text' => 'C'
+                              'contents' => [
+                                {
+                                  'text' => 'C'
+                                }
+                              ],
+                              'type' => 'following_arg'
                             }
                           ],
-                          'type' => 'following_arg'
+                          'source_info' => {
+                            'line_nr' => 68
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 68
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 68
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 68
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -6632,101 +6736,106 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'quotedblleft',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 70
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'quotedblright',
-              'contents' => [
+                  'cmdname' => 'quotedblleft',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 70
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 70
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'quoteleft',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 70
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'quoteright',
-              'contents' => [
+                  'cmdname' => 'quotedblright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 70
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 70
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'quotedblbase',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 70
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'quotesinglbase',
-              'contents' => [
+                  'cmdname' => 'quoteleft',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 70
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'quoteright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 70
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'quotedblbase',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 70
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'quotesinglbase',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 70
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 70
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
@@ -6741,102 +6850,105 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'quotedblleft',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 71
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'quotedblright',
-              'contents' => [
+                  'cmdname' => 'quotedblleft',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 71
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 71
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'quoteleft',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 71
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'quoteright',
-              'contents' => [
+                  'cmdname' => 'quotedblright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 71
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 71
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'quotedblbase',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 71
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'quotesinglbase',
-              'contents' => [
+                  'cmdname' => 'quoteleft',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 71
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'quoteright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 71
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'quotedblbase',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 71
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'quotesinglbase',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 71
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 71
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+                }
+              },
+              'type' => 'line_arg'
+            }
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -6856,101 +6968,106 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'guillemetleft',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 73
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'guillemetright',
-              'contents' => [
+                  'cmdname' => 'guillemetleft',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 73
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 73
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'guillemotleft',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 73
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'guillemotright',
-              'contents' => [
+                  'cmdname' => 'guillemetright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 73
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 73
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'guilsinglleft',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 73
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'guilsinglright',
-              'contents' => [
+                  'cmdname' => 'guillemotleft',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 73
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'guillemotright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 73
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'guilsinglleft',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 73
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'guilsinglright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 73
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 73
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
@@ -6965,102 +7082,105 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'guillemetleft',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 74
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'guillemetright',
-              'contents' => [
+                  'cmdname' => 'guillemetleft',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 74
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 74
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'guillemotleft',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 74
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'guillemotright',
-              'contents' => [
+                  'cmdname' => 'guillemetright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 74
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 74
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'guilsinglleft',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 74
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'guilsinglright',
-              'contents' => [
+                  'cmdname' => 'guillemotleft',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 74
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'guillemotright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 74
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'guilsinglleft',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 74
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'guilsinglright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 74
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 74
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -7080,23 +7200,28 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '`` \'\' --- -- ` \''
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => '`` \'\' --- -- ` \''
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
@@ -7109,26 +7234,29 @@ $result_trees{'at_commands_in_refs'} = {
       'source_info' => {
         'line_nr' => 76
       }
-    },
-    {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => '`` \'\' --- -- ` \''
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
+    },
+    {
       'cmdname' => 'chapter',
       'contents' => [
+        {
+          'contents' => [
+            {
+              'contents' => [
+                {
+                  'text' => '`` \'\' --- -- ` \''
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
+              },
+              'type' => 'line_arg'
+            }
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -7148,87 +7276,92 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'acronym',
               'contents' => [
                 {
+                  'cmdname' => 'acronym',
                   'contents' => [
                     {
-                      'text' => 'AAA'
+                      'contents' => [
+                        {
+                          'text' => 'AAA'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'fff'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 79
+                  }
                 },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'fff'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 79
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'acronym',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'acronym',
                   'contents' => [
                     {
-                      'text' => 'AAA'
+                      'contents' => [
+                        {
+                          'text' => 'AAA'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 79
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'acronym',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 79
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'acronym',
                   'contents' => [
                     {
-                      'text' => 'BBB'
+                      'contents' => [
+                        {
+                          'text' => 'BBB'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 79
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 79
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'AAA-AAA-BBB'
@@ -7243,88 +7376,91 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'acronym',
               'contents' => [
                 {
+                  'cmdname' => 'acronym',
                   'contents' => [
                     {
-                      'text' => 'AAA'
+                      'contents' => [
+                        {
+                          'text' => 'AAA'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'fff'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 80
+                  }
                 },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'fff'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 80
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'acronym',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'acronym',
                   'contents' => [
                     {
-                      'text' => 'AAA'
+                      'contents' => [
+                        {
+                          'text' => 'AAA'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 80
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'acronym',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 80
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'acronym',
                   'contents' => [
                     {
-                      'text' => 'BBB'
+                      'contents' => [
+                        {
+                          'text' => 'BBB'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 80
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 80
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -7344,89 +7480,89 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'abbr',
               'contents' => [
                 {
+                  'cmdname' => 'abbr',
                   'contents' => [
                     {
-                      'text' => 'CCC'
+                      'contents' => [
+                        {
+                          'text' => 'CCC'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'rrr'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 82
+                  }
                 },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'rrr'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 82
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'abbr',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'abbr',
                   'contents' => [
                     {
-                      'text' => 'CCC'
+                      'contents' => [
+                        {
+                          'text' => 'CCC'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 82
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'abbr',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 82
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'abbr',
                   'contents' => [
                     {
-                      'text' => 'DDD'
+                      'contents' => [
+                        {
+                          'text' => 'DDD'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 82
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 82
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
-        {
+          ],
           'source_marks' => [
             {
               'counter' => 1,
@@ -7456,7 +7592,7 @@ $result_trees{'at_commands_in_refs'} = {
               'status' => 'start'
             }
           ],
-          'text' => ''
+          'type' => 'argument'
         }
       ],
       'extra' => {
@@ -7473,89 +7609,89 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'abbr',
               'contents' => [
                 {
+                  'cmdname' => 'abbr',
                   'contents' => [
                     {
-                      'text' => 'CCC'
-                    }
-                  ],
-                  'type' => 'brace_arg'
-                },
-                {
-                  'contents' => [
-                    {
-                      'text' => 'rrr'
+                      'contents' => [
+                        {
+                          'text' => 'CCC'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'rrr'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 84
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'abbr',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 84
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'abbr',
                   'contents' => [
                     {
-                      'text' => 'CCC'
+                      'contents' => [
+                        {
+                          'text' => 'CCC'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 84
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'abbr',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 84
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'abbr',
                   'contents' => [
                     {
-                      'text' => 'DDD'
+                      'contents' => [
+                        {
+                          'text' => 'DDD'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 84
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 84
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
-        {
+          ],
           'source_marks' => [
             {
               'counter' => 1,
@@ -7593,7 +7729,7 @@ $result_trees{'at_commands_in_refs'} = {
               'status' => 'end'
             }
           ],
-          'text' => ''
+          'type' => 'argument'
         },
         {
           'text' => '
@@ -7614,80 +7750,85 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'email',
               'contents' => [
                 {
+                  'cmdname' => 'email',
                   'contents' => [
                     {
-                      'text' => 'someone'
-                    },
-                    {
-                      'cmdname' => '@'
+                      'contents' => [
+                        {
+                          'text' => 'someone'
+                        },
+                        {
+                          'cmdname' => '@'
+                        },
+                        {
+                          'text' => 'somewher'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     },
                     {
-                      'text' => 'somewher'
+                      'contents' => [
+                        {
+                          'text' => 'the someone'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 87
+                  }
                 },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'the someone'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 87
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'email',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'email',
                   'contents' => [
                     {
-                      'text' => 'no_explain'
-                    },
-                    {
-                      'cmdname' => '@'
-                    },
-                    {
-                      'text' => 'there'
+                      'contents' => [
+                        {
+                          'text' => 'no_explain'
+                        },
+                        {
+                          'cmdname' => '@'
+                        },
+                        {
+                          'text' => 'there'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 87
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 87
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'someone_0040somewher-no_005fexplain_0040there'
@@ -7702,81 +7843,84 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'email',
               'contents' => [
                 {
+                  'cmdname' => 'email',
                   'contents' => [
                     {
-                      'text' => 'someone'
-                    },
-                    {
-                      'cmdname' => '@'
+                      'contents' => [
+                        {
+                          'text' => 'someone'
+                        },
+                        {
+                          'cmdname' => '@'
+                        },
+                        {
+                          'text' => 'somewher'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     },
                     {
-                      'text' => 'somewher'
+                      'contents' => [
+                        {
+                          'text' => 'the someone'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 88
+                  }
                 },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'the someone'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 88
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'email',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'email',
                   'contents' => [
                     {
-                      'text' => 'no_explain'
-                    },
-                    {
-                      'cmdname' => '@'
-                    },
-                    {
-                      'text' => 'there'
+                      'contents' => [
+                        {
+                          'text' => 'no_explain'
+                        },
+                        {
+                          'cmdname' => '@'
+                        },
+                        {
+                          'text' => 'there'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 88
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 88
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -7796,95 +7940,95 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'image',
-              'contents' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'f--ile1'
-                    }
-                  ],
-                  'type' => 'brace_arg'
-                }
-              ],
-              'extra' => {
-                'input_encoding_name' => 'utf-8'
-              },
-              'source_info' => {
-                'line_nr' => 90
-              }
-            },
-            {
-              'text' => '  '
-            },
-            {
-              'cmdname' => 'image',
-              'contents' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'f--ile'
-                    }
-                  ],
-                  'type' => 'brace_arg'
-                },
-                {
-                  'contents' => [
-                    {
-                      'text' => 'aze'
-                    }
-                  ],
-                  'type' => 'brace_arg'
-                },
-                {
-                  'contents' => [
-                    {
-                      'text' => 'az'
-                    }
-                  ],
-                  'type' => 'brace_arg'
-                },
+              'contents' => [
                 {
+                  'cmdname' => 'image',
                   'contents' => [
                     {
-                      'text' => 'alt'
+                      'contents' => [
+                        {
+                          'text' => 'f--ile1'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'extra' => {
+                    'input_encoding_name' => 'utf-8'
+                  },
+                  'source_info' => {
+                    'line_nr' => 90
+                  }
+                },
+                {
+                  'text' => '  '
                 },
                 {
+                  'cmdname' => 'image',
                   'contents' => [
                     {
-                      'text' => 'e--xt'
+                      'contents' => [
+                        {
+                          'text' => 'f--ile'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'aze'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'az'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'alt'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'e--xt'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'extra' => {
+                    'input_encoding_name' => 'utf-8'
+                  },
+                  'source_info' => {
+                    'line_nr' => 90
+                  }
                 }
               ],
-              'extra' => {
-                'input_encoding_name' => 'utf-8'
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
               },
-              'source_info' => {
-                'line_nr' => 90
-              }
+              'type' => 'line_arg'
             }
           ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
-        {
           'source_marks' => [
             {
               'counter' => 2,
@@ -7914,7 +8058,7 @@ $result_trees{'at_commands_in_refs'} = {
               'status' => 'start'
             }
           ],
-          'text' => ''
+          'type' => 'argument'
         }
       ],
       'extra' => {
@@ -7931,95 +8075,95 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'image',
-              'contents' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'f--ile1'
-                    }
-                  ],
-                  'type' => 'brace_arg'
-                }
-              ],
-              'extra' => {
-                'input_encoding_name' => 'utf-8'
-              },
-              'source_info' => {
-                'line_nr' => 92
-              }
-            },
-            {
-              'text' => '  '
-            },
-            {
-              'cmdname' => 'image',
               'contents' => [
                 {
+                  'cmdname' => 'image',
                   'contents' => [
                     {
-                      'text' => 'f--ile'
+                      'contents' => [
+                        {
+                          'text' => 'f--ile1'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'extra' => {
+                    'input_encoding_name' => 'utf-8'
+                  },
+                  'source_info' => {
+                    'line_nr' => 92
+                  }
                 },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'aze'
-                    }
-                  ],
-                  'type' => 'brace_arg'
+                  'text' => '  '
                 },
                 {
+                  'cmdname' => 'image',
                   'contents' => [
                     {
-                      'text' => 'az'
-                    }
-                  ],
-                  'type' => 'brace_arg'
-                },
-                {
-                  'contents' => [
+                      'contents' => [
+                        {
+                          'text' => 'f--ile'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
                     {
-                      'text' => 'alt'
-                    }
-                  ],
-                  'type' => 'brace_arg'
-                },
-                {
-                  'contents' => [
+                      'contents' => [
+                        {
+                          'text' => 'aze'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'az'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'alt'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
                     {
-                      'text' => 'e--xt'
+                      'contents' => [
+                        {
+                          'text' => 'e--xt'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'extra' => {
+                    'input_encoding_name' => 'utf-8'
+                  },
+                  'source_info' => {
+                    'line_nr' => 92
+                  }
                 }
               ],
-              'extra' => {
-                'input_encoding_name' => 'utf-8'
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
               },
-              'source_info' => {
-                'line_nr' => 92
-              }
+              'type' => 'line_arg'
             }
           ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
-        {
           'source_marks' => [
             {
               'counter' => 2,
@@ -8057,7 +8201,7 @@ $result_trees{'at_commands_in_refs'} = {
               'status' => 'end'
             }
           ],
-          'text' => ''
+          'type' => 'argument'
         },
         {
           'text' => '
@@ -8078,42 +8222,42 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'verb',
               'contents' => [
                 {
+                  'cmdname' => 'verb',
                   'contents' => [
                     {
-                      'text' => ' @ {} . ',
-                      'type' => 'raw'
+                      'contents' => [
+                        {
+                          'text' => ' @ {} . ',
+                          'type' => 'raw'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'info' => {
+                    'delimiter' => '.'
+                  },
+                  'source_info' => {
+                    'line_nr' => 95
+                  }
                 }
               ],
               'info' => {
-                'delimiter' => '.'
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
               },
-              'source_info' => {
-                'line_nr' => 95
-              }
+              'type' => 'line_arg'
             }
           ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
-        {
           'source_marks' => [
             {
               'counter' => 3,
@@ -8143,7 +8287,7 @@ $result_trees{'at_commands_in_refs'} = {
               'status' => 'start'
             }
           ],
-          'text' => ''
+          'type' => 'argument'
         }
       ],
       'extra' => {
@@ -8160,42 +8304,42 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'verb',
               'contents' => [
                 {
+                  'cmdname' => 'verb',
                   'contents' => [
                     {
-                      'text' => ' @ {} . ',
-                      'type' => 'raw'
+                      'contents' => [
+                        {
+                          'text' => ' @ {} . ',
+                          'type' => 'raw'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'info' => {
+                    'delimiter' => '.'
+                  },
+                  'source_info' => {
+                    'line_nr' => 97
+                  }
                 }
               ],
               'info' => {
-                'delimiter' => '.'
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
               },
-              'source_info' => {
-                'line_nr' => 97
-              }
+              'type' => 'line_arg'
             }
           ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
-        {
           'source_marks' => [
             {
               'counter' => 3,
@@ -8233,7 +8377,7 @@ $result_trees{'at_commands_in_refs'} = {
               'status' => 'end'
             }
           ],
-          'text' => ''
+          'type' => 'argument'
         },
         {
           'text' => '
@@ -8254,226 +8398,231 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'cite',
               'contents' => [
                 {
+                  'cmdname' => 'cite',
                   'contents' => [
                     {
-                      'text' => 'cite '
-                    },
-                    {
-                      'cmdname' => 'asis',
                       'contents' => [
                         {
+                          'text' => 'cite '
+                        },
+                        {
+                          'cmdname' => 'asis',
                           'contents' => [
                             {
-                              'text' => 'asis'
+                              'contents' => [
+                                {
+                                  'text' => 'asis'
+                                }
+                              ],
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'brace_container'
+                          'source_info' => {
+                            'line_nr' => 100
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 100
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 100
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'w',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 100
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'w',
                   'contents' => [
                     {
-                      'text' => 'in '
-                    },
-                    {
-                      'cmdname' => '@'
-                    },
-                    {
-                      'text' => 'w '
-                    },
-                    {
-                      'cmdname' => 'b',
                       'contents' => [
                         {
+                          'text' => 'in '
+                        },
+                        {
+                          'cmdname' => '@'
+                        },
+                        {
+                          'text' => 'w '
+                        },
+                        {
+                          'cmdname' => 'b',
                           'contents' => [
                             {
-                              'text' => 'b'
+                              'contents' => [
+                                {
+                                  'text' => 'b'
+                                }
+                              ],
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'brace_container'
-                        }
-                      ],
-                      'source_info' => {
-                        'line_nr' => 100
-                      }
-                    }
-                  ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 100
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'r',
-              'contents' => [
+                          'source_info' => {
+                            'line_nr' => 100
+                          }
+                        }
+                      ],
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 100
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'r',
                   'contents' => [
                     {
-                      'text' => 'in r'
+                      'contents' => [
+                        {
+                          'text' => 'in r'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 100
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'sc',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 100
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'sc',
                   'contents' => [
                     {
-                      'text' => 'sc'
+                      'contents' => [
+                        {
+                          'text' => 'sc'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 100
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'strong',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 100
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'strong',
                   'contents' => [
                     {
-                      'text' => 'str'
+                      'contents' => [
+                        {
+                          'text' => 'str'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 100
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 't',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 100
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 't',
                   'contents' => [
                     {
-                      'text' => 't'
+                      'contents' => [
+                        {
+                          'text' => 't'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 100
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'var',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 100
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'var',
                   'contents' => [
                     {
-                      'text' => 'var'
+                      'contents' => [
+                        {
+                          'text' => 'var'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 100
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'dfn',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 100
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'dfn',
                   'contents' => [
                     {
-                      'text' => 'dfn'
+                      'contents' => [
+                        {
+                          'text' => 'dfn'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 100
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'i',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 100
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'i',
                   'contents' => [
                     {
-                      'text' => 'i'
+                      'contents' => [
+                        {
+                          'text' => 'i'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 100
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 100
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'cite-asis-in-_0040w-b-in-r-sc-str-t-var-dfn-i'
@@ -8488,227 +8637,230 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'cite',
               'contents' => [
                 {
+                  'cmdname' => 'cite',
                   'contents' => [
                     {
-                      'text' => 'cite '
-                    },
-                    {
-                      'cmdname' => 'asis',
                       'contents' => [
                         {
+                          'text' => 'cite '
+                        },
+                        {
+                          'cmdname' => 'asis',
                           'contents' => [
                             {
-                              'text' => 'asis'
+                              'contents' => [
+                                {
+                                  'text' => 'asis'
+                                }
+                              ],
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'brace_container'
+                          'source_info' => {
+                            'line_nr' => 101
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 101
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 101
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'w',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 101
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'w',
                   'contents' => [
                     {
-                      'text' => 'in '
-                    },
-                    {
-                      'cmdname' => '@'
-                    },
-                    {
-                      'text' => 'w '
-                    },
-                    {
-                      'cmdname' => 'b',
                       'contents' => [
                         {
+                          'text' => 'in '
+                        },
+                        {
+                          'cmdname' => '@'
+                        },
+                        {
+                          'text' => 'w '
+                        },
+                        {
+                          'cmdname' => 'b',
                           'contents' => [
                             {
-                              'text' => 'b'
+                              'contents' => [
+                                {
+                                  'text' => 'b'
+                                }
+                              ],
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'brace_container'
+                          'source_info' => {
+                            'line_nr' => 101
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 101
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 101
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'r',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 101
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'r',
                   'contents' => [
                     {
-                      'text' => 'in r'
+                      'contents' => [
+                        {
+                          'text' => 'in r'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 101
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'sc',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 101
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'sc',
                   'contents' => [
                     {
-                      'text' => 'sc'
+                      'contents' => [
+                        {
+                          'text' => 'sc'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 101
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'strong',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 101
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'strong',
                   'contents' => [
                     {
-                      'text' => 'str'
+                      'contents' => [
+                        {
+                          'text' => 'str'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 101
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 't',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 101
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 't',
                   'contents' => [
                     {
-                      'text' => 't'
+                      'contents' => [
+                        {
+                          'text' => 't'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 101
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'var',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 101
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'var',
                   'contents' => [
                     {
-                      'text' => 'var'
+                      'contents' => [
+                        {
+                          'text' => 'var'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 101
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'dfn',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 101
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'dfn',
                   'contents' => [
                     {
-                      'text' => 'dfn'
+                      'contents' => [
+                        {
+                          'text' => 'dfn'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 101
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'i',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 101
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'i',
                   'contents' => [
                     {
-                      'text' => 'i'
+                      'contents' => [
+                        {
+                          'text' => 'i'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 101
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 101
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -8728,166 +8880,171 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'env',
               'contents' => [
                 {
+                  'cmdname' => 'env',
                   'contents' => [
                     {
-                      'text' => 'env'
+                      'contents' => [
+                        {
+                          'text' => 'env'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 103
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'code',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 103
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'code',
                   'contents' => [
                     {
-                      'text' => 'code'
+                      'contents' => [
+                        {
+                          'text' => 'code'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 103
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'option',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 103
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'option',
                   'contents' => [
                     {
-                      'text' => 'option'
+                      'contents' => [
+                        {
+                          'text' => 'option'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 103
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'samp',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 103
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'samp',
                   'contents' => [
                     {
-                      'text' => 'samp'
+                      'contents' => [
+                        {
+                          'text' => 'samp'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 103
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'command',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 103
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'command',
                   'contents' => [
                     {
-                      'text' => 'command'
+                      'contents' => [
+                        {
+                          'text' => 'command'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 103
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'file',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 103
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'file',
                   'contents' => [
                     {
-                      'text' => 'file'
+                      'contents' => [
+                        {
+                          'text' => 'file'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 103
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'kbd',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 103
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'kbd',
                   'contents' => [
                     {
-                      'text' => 'C-x '
-                    },
-                    {
-                      'cmdname' => 'key',
                       'contents' => [
                         {
+                          'text' => 'C-x '
+                        },
+                        {
+                          'cmdname' => 'key',
                           'contents' => [
                             {
-                              'text' => 'ESC'
+                              'contents' => [
+                                {
+                                  'text' => 'ESC'
+                                }
+                              ],
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'brace_container'
+                          'source_info' => {
+                            'line_nr' => 103
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 103
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 103
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 103
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC'
@@ -8902,167 +9059,170 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'env',
               'contents' => [
                 {
+                  'cmdname' => 'env',
                   'contents' => [
                     {
-                      'text' => 'env'
+                      'contents' => [
+                        {
+                          'text' => 'env'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 104
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'code',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 104
+                  }
+                },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'code'
-                    }
-                  ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 104
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'option',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'code',
                   'contents' => [
                     {
-                      'text' => 'option'
+                      'contents' => [
+                        {
+                          'text' => 'code'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 104
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'samp',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 104
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'option',
                   'contents' => [
                     {
-                      'text' => 'samp'
+                      'contents' => [
+                        {
+                          'text' => 'option'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 104
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'command',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 104
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'samp',
                   'contents' => [
                     {
-                      'text' => 'command'
+                      'contents' => [
+                        {
+                          'text' => 'samp'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 104
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'file',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 104
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'command',
                   'contents' => [
                     {
-                      'text' => 'file'
+                      'contents' => [
+                        {
+                          'text' => 'command'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 104
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'kbd',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 104
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'file',
                   'contents' => [
                     {
-                      'text' => 'C-x '
-                    },
+                      'contents' => [
+                        {
+                          'text' => 'file'
+                        }
+                      ],
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 104
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'kbd',
+                  'contents' => [
                     {
-                      'cmdname' => 'key',
                       'contents' => [
                         {
+                          'text' => 'C-x '
+                        },
+                        {
+                          'cmdname' => 'key',
                           'contents' => [
                             {
-                              'text' => 'ESC'
+                              'contents' => [
+                                {
+                                  'text' => 'ESC'
+                                }
+                              ],
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'brace_container'
+                          'source_info' => {
+                            'line_nr' => 104
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 104
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 104
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 104
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -9082,39 +9242,44 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '8.27'
-            },
-            {
-              'cmdname' => 'dmn',
               'contents' => [
                 {
+                  'text' => '8.27'
+                },
+                {
+                  'cmdname' => 'dmn',
                   'contents' => [
                     {
-                      'text' => 'in'
+                      'contents' => [
+                        {
+                          'text' => 'in'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 106
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 106
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '8_002e27in'
@@ -9129,40 +9294,43 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '8.27'
-            },
-            {
-              'cmdname' => 'dmn',
               'contents' => [
                 {
+                  'text' => '8.27'
+                },
+                {
+                  'cmdname' => 'dmn',
                   'contents' => [
                     {
-                      'text' => 'in'
+                      'contents' => [
+                        {
+                          'text' => 'in'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 107
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 107
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -9182,55 +9350,60 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'sansserif',
               'contents' => [
                 {
+                  'cmdname' => 'sansserif',
                   'contents' => [
                     {
-                      'text' => 'sansserif'
+                      'contents' => [
+                        {
+                          'text' => 'sansserif'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 109
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'slanted',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 109
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'slanted',
                   'contents' => [
                     {
-                      'text' => 'slanted'
+                      'contents' => [
+                        {
+                          'text' => 'slanted'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 109
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 109
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sansserif-slanted'
@@ -9245,56 +9418,59 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'sansserif',
               'contents' => [
                 {
+                  'cmdname' => 'sansserif',
                   'contents' => [
                     {
-                      'text' => 'sansserif'
+                      'contents' => [
+                        {
+                          'text' => 'sansserif'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 110
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'slanted',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 110
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'slanted',
                   'contents' => [
                     {
-                      'text' => 'slanted'
+                      'contents' => [
+                        {
+                          'text' => 'slanted'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 110
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 110
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -9314,36 +9490,41 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'indicateurl',
               'contents' => [
                 {
+                  'cmdname' => 'indicateurl',
                   'contents' => [
                     {
-                      'text' => 'indicateurl'
+                      'contents' => [
+                        {
+                          'text' => 'indicateurl'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 112
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 112
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'indicateurl'
@@ -9358,37 +9539,40 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'indicateurl',
               'contents' => [
                 {
+                  'cmdname' => 'indicateurl',
                   'contents' => [
                     {
-                      'text' => 'indicateurl'
+                      'contents' => [
+                        {
+                          'text' => 'indicateurl'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 113
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 113
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -9408,55 +9592,60 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'sub',
               'contents' => [
                 {
+                  'cmdname' => 'sub',
                   'contents' => [
                     {
-                      'text' => 'g'
+                      'contents' => [
+                        {
+                          'text' => 'g'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 115
-              }
-            },
-            {
-              'text' => 'H 3'
-            },
-            {
-              'cmdname' => 'sup',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 115
+                  }
+                },
+                {
+                  'text' => 'H 3'
+                },
                 {
+                  'cmdname' => 'sup',
                   'contents' => [
                     {
-                      'text' => 'rd'
+                      'contents' => [
+                        {
+                          'text' => 'rd'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 115
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 115
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'gH-3rd'
@@ -9471,56 +9660,59 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'sub',
               'contents' => [
                 {
+                  'cmdname' => 'sub',
                   'contents' => [
                     {
-                      'text' => 'g'
+                      'contents' => [
+                        {
+                          'text' => 'g'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 116
-              }
-            },
-            {
-              'text' => 'H 3'
-            },
-            {
-              'cmdname' => 'sup',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 116
+                  }
+                },
+                {
+                  'text' => 'H 3'
+                },
                 {
+                  'cmdname' => 'sup',
                   'contents' => [
                     {
-                      'text' => 'rd'
+                      'contents' => [
+                        {
+                          'text' => 'rd'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 116
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 116
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -9540,98 +9732,103 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'url',
               'contents' => [
                 {
+                  'cmdname' => 'url',
                   'contents' => [
                     {
-                      'text' => 'http://somewhere_aaa'
+                      'contents' => [
+                        {
+                          'text' => 'http://somewhere_aaa'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 118
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'url',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 118
+                  }
+                },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'url'
-                    }
-                  ],
-                  'type' => 'brace_arg'
+                  'text' => ' '
                 },
                 {
+                  'cmdname' => 'url',
                   'contents' => [
                     {
-                      'text' => 'text'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 118
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'uref',
-              'contents' => [
-                {
-                  'contents' => [
+                      'contents' => [
+                        {
+                          'text' => 'url'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
                     {
-                      'text' => '/man.cgi/1/ls'
+                      'contents' => [
+                        {
+                          'text' => 'text'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 118
+                  }
                 },
                 {
-                  'type' => 'brace_arg'
+                  'text' => ' '
                 },
                 {
+                  'cmdname' => 'uref',
                   'contents' => [
                     {
-                      'text' => 'ls'
+                      'contents' => [
+                        {
+                          'text' => '/man.cgi/1/ls'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'ls'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 118
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 118
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
@@ -9646,99 +9843,102 @@ $result_trees{'at_commands_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'url',
               'contents' => [
                 {
+                  'cmdname' => 'url',
                   'contents' => [
                     {
-                      'text' => 'http://somewhere_aaa'
+                      'contents' => [
+                        {
+                          'text' => 'http://somewhere_aaa'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 119
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'url',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 119
+                  }
+                },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'url'
-                    }
-                  ],
-                  'type' => 'brace_arg'
+                  'text' => ' '
                 },
                 {
+                  'cmdname' => 'url',
                   'contents' => [
                     {
-                      'text' => 'text'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 119
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'uref',
-              'contents' => [
-                {
-                  'contents' => [
+                      'contents' => [
+                        {
+                          'text' => 'url'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
                     {
-                      'text' => '/man.cgi/1/ls'
+                      'contents' => [
+                        {
+                          'text' => 'text'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 119
+                  }
                 },
                 {
-                  'type' => 'brace_arg'
+                  'text' => ' '
                 },
                 {
+                  'cmdname' => 'uref',
                   'contents' => [
                     {
-                      'text' => 'ls'
+                      'contents' => [
+                        {
+                          'text' => '/man.cgi/1/ls'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'ls'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 119
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 119
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -13175,470 +13375,470 @@ $result_trees{'at_commands_in_refs'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[13];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[14];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[15];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[16];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[13];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[14];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[15];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[16];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[17]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[17];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[18]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[18];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[19]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[19];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[20]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[20];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[21]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[21];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[22]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[22];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[23]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[23];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[24]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[24];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[25]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[25];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[26]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[26];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[13];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[14];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[15];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[16];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[17]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[17];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[18]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[18];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[19]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[19];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[20]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[20];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[13];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[14];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[15];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[16];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[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'}[27]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[17]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[17];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[18]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[18];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[19]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[19];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[20]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[20];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[21]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[21];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[22]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[22];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[23]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[23];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[24]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[24];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[25]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[25];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[26]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[26];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[17]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[17];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[18]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[18];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[19]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[19];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[20]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[20];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[13];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[14];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[15];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[16];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[13];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[14];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[15];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[16];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[17]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[17];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[18]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[18];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[19]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[19];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[20]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[20];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[21]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[21];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[22]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[22];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[23]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[23];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[24]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[24];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[25]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[25];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[26]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[26];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[13];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[14];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[15];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[16];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[17]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[17];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[18]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[18];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[19]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[19];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[20]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[20];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[15]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[15]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[16]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[16]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[16]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[16]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[16]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[17]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[17]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[17]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[17]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[17]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[18]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[18]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[18]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[18]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[18]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[18]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[19]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[19]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[19]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[19]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[19]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[19]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[20]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[13];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[14];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[15];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[16];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[23]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[23]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[23]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[23]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[24]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[24]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[24]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[24]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[24]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[24]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[25]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[25]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[26]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[26]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[26]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[27]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[27]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[27]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[27]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[27]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[13];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[14];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[15];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[16];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[13];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[14];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[15];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[16];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[17]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[17];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[18]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[18];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[19]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[19];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[20]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[20];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[21]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[21];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[22]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[22];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[23]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[23];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[24]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[24];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[25]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[25];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[26]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[26];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[13];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[14];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[15];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[16];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[17]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[17];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[18]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[18];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[19]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[19];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[20]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[20];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[30]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[40]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[40]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[13];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[14];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[15];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[16];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[46]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[46]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[46]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[46]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[48]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[48]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[48]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[48]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[48]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[48]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[50]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[50]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[52]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[52]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[52]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[52]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[52]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[52]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[54]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[54]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[54]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[54]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[54]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[54]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[54]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[54]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[54]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[54]{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
 $result_texis{'at_commands_in_refs'} = '@node Top
 @top Top
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl
index c4525c3530..8969502257 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
@@ -84,23 +84,28 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -115,24 +120,27 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3692,35 +3700,40 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => '-'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '{'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '}'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'cmdname' => '-'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '{'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '}'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '-_007b-_007d'
@@ -3735,36 +3748,39 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => '-'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '{'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '}'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'cmdname' => '-'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '{'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '}'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3784,71 +3800,76 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => ' '
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '   '
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '!'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '*'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '.'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => ':'
-            },
-            {
-              'text' => ' .'
-            },
-            {
-              'cmdname' => ':'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '?'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '@'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'cmdname' => ' '
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '       '
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '!'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '*'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '.'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => ':'
+                },
+                {
+                  'text' => ' .'
+                },
+                {
+                  'cmdname' => ':'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '?'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '@'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '-_0021-_002e-_002e-_003f-_0040'
@@ -3863,172 +3884,180 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'cmdname' => ' '
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '   '
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '!'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '*'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '.'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => ':'
-            },
-            {
-              'text' => ' .'
-            },
-            {
-              'cmdname' => ':'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '?'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '@'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
       'cmdname' => 'chapter',
       'contents' => [
-        {
-          'text' => '
-',
-          'type' => 'empty_line'
-        }
-      ],
-      'extra' => {
-        'section_number' => '2'
-      },
-      'info' => {
-        'spaces_before_argument' => {
-          'text' => ' '
-        }
-      },
-      'source_info' => {
-        'line_nr' => 41
-      }
-    },
-    {
-      'args' => [
         {
           'contents' => [
             {
-              'cmdname' => 'atchar',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 43
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'lbracechar',
-              'contents' => [
+                  'cmdname' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 43
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'rbracechar',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 43
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'backslashchar',
-              'contents' => [
+                  'cmdname' => '       '
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '!'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '*'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '.'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => ':'
+                },
+                {
+                  'text' => ' .'
+                },
+                {
+                  'cmdname' => ':'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '?'
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => '@'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 43
-              }
-            },
-            {
-              'text' => ' '
-            },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
+              },
+              'type' => 'line_arg'
+            }
+          ],
+          'type' => 'argument'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        }
+      ],
+      'extra' => {
+        'section_number' => '2'
+      },
+      'info' => {
+        'spaces_before_argument' => {
+          'text' => ' '
+        }
+      },
+      'source_info' => {
+        'line_nr' => 41
+      }
+    },
+    {
+      'cmdname' => 'node',
+      'contents' => [
+        {
+          'contents' => [
             {
-              'cmdname' => 'hashchar',
               'contents' => [
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'atchar',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 43
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'lbracechar',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 43
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'rbracechar',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 43
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'backslashchar',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 43
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'hashchar',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 43
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 43
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_0040-_007b-_007d-_005c-_0023'
@@ -4043,88 +4072,91 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'atchar',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 44
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'lbracechar',
-              'contents' => [
+                  'cmdname' => 'atchar',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 44
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 44
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'rbracechar',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 44
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'backslashchar',
-              'contents' => [
+                  'cmdname' => 'lbracechar',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 44
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 44
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'hashchar',
-              'contents' => [
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'rbracechar',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 44
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'backslashchar',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 44
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'hashchar',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 44
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 44
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -4144,115 +4176,120 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'LaTeX',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 46
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'TeX',
-              'contents' => [
+                  'cmdname' => 'LaTeX',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 46
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 46
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'bullet',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 46
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'comma',
-              'contents' => [
+                  'cmdname' => 'TeX',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 46
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 46
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'copyright',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 46
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'dots',
-              'contents' => [
+                  'cmdname' => 'bullet',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 46
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 46
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'enddots',
-              'contents' => [
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'comma',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 46
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'copyright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 46
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'dots',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 46
+                  }
+                },
                 {
-                  'type' => 'brace_container'
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'enddots',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 46
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 46
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
@@ -4267,116 +4304,119 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'LaTeX',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 47
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'TeX',
-              'contents' => [
+                  'cmdname' => 'LaTeX',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 47
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 47
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'bullet',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 47
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'comma',
-              'contents' => [
+                  'cmdname' => 'TeX',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 47
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 47
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'copyright',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 47
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'dots',
-              'contents' => [
+                  'cmdname' => 'bullet',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 47
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 47
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'enddots',
-              'contents' => [
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'comma',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 47
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'copyright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 47
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'dots',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 47
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'enddots',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 47
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 47
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -4396,101 +4436,106 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
-        {
+      'cmdname' => 'node',
+      'contents' => [
+        {
           'contents' => [
             {
-              'cmdname' => 'equiv',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 49
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'error',
-              'contents' => [
+                  'cmdname' => 'equiv',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 49
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 49
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'euro',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 49
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'exclamdown',
-              'contents' => [
+                  'cmdname' => 'error',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 49
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 49
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'expansion',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 49
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'minus',
-              'contents' => [
+                  'cmdname' => 'euro',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 49
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'exclamdown',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 49
+                  }
+                },
                 {
-                  'type' => 'brace_container'
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'expansion',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 49
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'minus',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 49
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 49
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
@@ -4505,102 +4550,105 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'equiv',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 50
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'error',
-              'contents' => [
+                  'cmdname' => 'equiv',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 50
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 50
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'euro',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 50
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'exclamdown',
-              'contents' => [
+                  'cmdname' => 'error',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 50
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 50
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'expansion',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 50
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'minus',
-              'contents' => [
+                  'cmdname' => 'euro',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 50
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'exclamdown',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 50
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'expansion',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 50
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'minus',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 50
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 50
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -4620,59 +4668,64 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'geq',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 52
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'leq',
-              'contents' => [
+                  'cmdname' => 'geq',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 52
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 52
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'arrow',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 52
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                  'cmdname' => 'leq',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 52
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'arrow',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 52
+                  }
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_2265-_2264-_2192'
@@ -4687,60 +4740,63 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'geq',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 53
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'leq',
-              'contents' => [
+                  'cmdname' => 'geq',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 53
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 53
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'arrow',
-              'contents' => [
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'leq',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 53
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'arrow',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 53
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 53
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -4760,115 +4816,120 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'ordf',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 55
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ordm',
-              'contents' => [
+                  'cmdname' => 'ordf',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 55
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 55
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'point',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 55
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'pounds',
-              'contents' => [
+                  'cmdname' => 'ordm',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 55
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 55
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'print',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 55
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'questiondown',
-              'contents' => [
+                  'cmdname' => 'point',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 55
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 55
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'registeredsymbol',
-              'contents' => [
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'pounds',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 55
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'print',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 55
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'questiondown',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 55
+                  }
+                },
                 {
-                  'type' => 'brace_container'
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'registeredsymbol',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 55
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 55
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae'
@@ -4883,116 +4944,119 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'ordf',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 56
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ordm',
-              'contents' => [
+                  'cmdname' => 'ordf',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 56
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 56
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'point',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 56
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'pounds',
-              'contents' => [
+                  'cmdname' => 'ordm',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 56
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 56
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'print',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 56
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'questiondown',
-              'contents' => [
+                  'cmdname' => 'point',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 56
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 56
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'registeredsymbol',
-              'contents' => [
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'pounds',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 56
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'print',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 56
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'questiondown',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 56
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'registeredsymbol',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 56
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 56
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -5012,87 +5076,92 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'result',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 58
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'textdegree',
-              'contents' => [
+                  'cmdname' => 'result',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 58
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 58
-              }
-            },
-            {
-              'text' => ' a'
-            },
-            {
-              'cmdname' => 'tie',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 58
-              }
-            },
-            {
-              'text' => 'b '
-            },
-            {
-              'cmdname' => 'today',
-              'contents' => [
+                  'cmdname' => 'textdegree',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 58
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 58
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'aa',
-              'contents' => [
+                  'text' => ' a'
+                },
+                {
+                  'cmdname' => 'tie',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 58
+                  }
+                },
+                {
+                  'text' => 'b '
+                },
+                {
+                  'cmdname' => 'today',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 58
+                  }
+                },
                 {
-                  'type' => 'brace_container'
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'aa',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 58
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 58
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_21d2-_00b0-a-b-_00e5'
@@ -5107,88 +5176,91 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'result',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 59
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'textdegree',
-              'contents' => [
+                  'cmdname' => 'result',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 59
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 59
-              }
-            },
-            {
-              'text' => ' a'
-            },
-            {
-              'cmdname' => 'tie',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 59
-              }
-            },
-            {
-              'text' => 'b '
-            },
-            {
-              'cmdname' => 'today',
-              'contents' => [
+                  'cmdname' => 'textdegree',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 59
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 59
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'aa',
-              'contents' => [
+                  'text' => ' a'
+                },
+                {
+                  'cmdname' => 'tie',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 59
+                  }
+                },
+                {
+                  'text' => 'b '
+                },
+                {
+                  'cmdname' => 'today',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 59
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'aa',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 59
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 59
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -5208,435 +5280,443 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'AA',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ae',
-              'contents' => [
+                  'cmdname' => 'AA',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'oe',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'AE',
-              'contents' => [
+                  'cmdname' => 'ae',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'OE',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'o',
-              'contents' => [
+                  'cmdname' => 'oe',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'O',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ss',
-              'contents' => [
+                  'cmdname' => 'AE',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'l',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'L',
-              'contents' => [
+                  'cmdname' => 'OE',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'DH',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'dh',
-              'contents' => [
+                  'cmdname' => 'o',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
                 {
-                  'type' => 'brace_container'
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'O',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'ss',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'l',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'L',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'DH',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'dh',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'TH',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'th',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => ' 
+'
+                }
+              },
+              'type' => 'line_arg'
+            }
+          ],
+          'type' => 'argument'
+        }
+      ],
+      'extra' => {
+        'is_target' => 1,
+        'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
+      },
+      'info' => {
+        'spaces_before_argument' => {
+          'text' => ' '
+        }
+      },
+      'source_info' => {
+        'line_nr' => 61
+      }
+    },
+    {
+      'cmdname' => 'chapter',
+      'contents' => [
+        {
+          'contents' => [
             {
-              'cmdname' => 'TH',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'th',
-              'contents' => [
+                  'cmdname' => 'AA',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'ae',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'oe',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'AE',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'OE',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'o',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => ' 
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'extra' => {
-        'is_target' => 1,
-        'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
-      },
-      'info' => {
-        'spaces_before_argument' => {
-          'text' => ' '
-        }
-      },
-      'source_info' => {
-        'line_nr' => 61
-      }
-    },
-    {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'cmdname' => 'AA',
-              'contents' => [
+                  'cmdname' => 'O',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ae',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'oe',
-              'contents' => [
+                  'cmdname' => 'ss',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'AE',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'OE',
-              'contents' => [
+                  'cmdname' => 'l',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'o',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'O',
-              'contents' => [
+                  'cmdname' => 'L',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ss',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'l',
-              'contents' => [
+                  'cmdname' => 'DH',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'L',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'DH',
-              'contents' => [
+                  'cmdname' => 'dh',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'dh',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'TH',
-              'contents' => [
+                  'cmdname' => 'TH',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'th',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'th',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => ' 
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => ' 
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -5656,239 +5736,244 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => '"',
               'contents' => [
                 {
+                  'cmdname' => '"',
                   'contents' => [
                     {
-                      'text' => 'a'
-                    }
-                  ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 64
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '~',
-              'contents' => [
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 64
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '~',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 64
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '^',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 64
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '^',
                   'contents' => [
                     {
-                      'cmdname' => 'dotless',
                       'contents' => [
                         {
+                          'cmdname' => 'dotless',
                           'contents' => [
                             {
-                              'text' => 'i'
+                              'contents' => [
+                                {
+                                  'text' => 'i'
+                                }
+                              ],
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'brace_container'
+                          'source_info' => {
+                            'line_nr' => 64
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 64
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 64
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '^',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 64
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '^',
                   'contents' => [
                     {
-                      'text' => 'a'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 64
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '`',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 64
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '`',
                   'contents' => [
                     {
-                      'text' => 'a'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 64
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '\'',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 64
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '\'',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'following_arg'
                     }
                   ],
-                  'type' => 'following_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 64
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => ',',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 64
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => ',',
                   'contents' => [
                     {
-                      'text' => 'c'
+                      'contents' => [
+                        {
+                          'text' => 'c'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 64
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '=',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 64
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '=',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 64
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ringaccent',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 64
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'ringaccent',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 64
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'H',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 64
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'H',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 64
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ogonek',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 64
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'ogonek',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 64
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 64
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
@@ -5903,240 +5988,243 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => '"',
               'contents' => [
                 {
+                  'cmdname' => '"',
                   'contents' => [
                     {
-                      'text' => 'a'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 65
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '~',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 65
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '~',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 65
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '^',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 65
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '^',
                   'contents' => [
                     {
-                      'cmdname' => 'dotless',
                       'contents' => [
                         {
+                          'cmdname' => 'dotless',
                           'contents' => [
                             {
-                              'text' => 'i'
+                              'contents' => [
+                                {
+                                  'text' => 'i'
+                                }
+                              ],
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'brace_container'
+                          'source_info' => {
+                            'line_nr' => 65
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 65
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 65
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '^',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 65
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '^',
                   'contents' => [
                     {
-                      'text' => 'a'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 65
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '`',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 65
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '`',
                   'contents' => [
                     {
-                      'text' => 'a'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 65
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '\'',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 65
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '\'',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'following_arg'
                     }
                   ],
-                  'type' => 'following_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 65
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => ',',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 65
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => ',',
                   'contents' => [
                     {
-                      'text' => 'c'
+                      'contents' => [
+                        {
+                          'text' => 'c'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 65
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '=',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 65
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '=',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 65
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ringaccent',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 65
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'ringaccent',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 65
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'H',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 65
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'H',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 65
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ogonek',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 65
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'ogonek',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 65
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 65
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -6156,150 +6244,155 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'dotaccent',
               'contents' => [
                 {
+                  'cmdname' => 'dotaccent',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 67
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'u',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 67
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'u',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 67
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ubaraccent',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 67
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'ubaraccent',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 67
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'udotaccent',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 67
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'udotaccent',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 67
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'v',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 67
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'v',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 67
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'dotless',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 67
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'dotless',
                   'contents' => [
                     {
-                      'text' => 'j'
+                      'contents' => [
+                        {
+                          'text' => 'j'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 67
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'tieaccent',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 67
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'tieaccent',
                   'contents' => [
                     {
-                      'text' => 'ee'
+                      'contents' => [
+                        {
+                          'text' => 'ee'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 67
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 67
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
@@ -6314,151 +6407,154 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'dotaccent',
               'contents' => [
                 {
+                  'cmdname' => 'dotaccent',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 68
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'u',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 68
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'u',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 68
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ubaraccent',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 68
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'ubaraccent',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 68
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'udotaccent',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 68
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'udotaccent',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 68
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'v',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 68
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'v',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 68
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'dotless',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 68
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'dotless',
                   'contents' => [
                     {
-                      'text' => 'j'
+                      'contents' => [
+                        {
+                          'text' => 'j'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 68
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'tieaccent',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 68
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'tieaccent',
                   'contents' => [
                     {
-                      'text' => 'ee'
+                      'contents' => [
+                        {
+                          'text' => 'ee'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 68
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 68
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -6478,100 +6574,105 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'dotless',
               'contents' => [
                 {
+                  'cmdname' => 'dotless',
                   'contents' => [
                     {
-                      'text' => 'i'
+                      'contents' => [
+                        {
+                          'text' => 'i'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 70
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '`',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 70
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '`',
                   'contents' => [
                     {
-                      'cmdname' => '=',
                       'contents' => [
                         {
+                          'cmdname' => '=',
                           'contents' => [
                             {
-                              'text' => 'E'
+                              'contents' => [
+                                {
+                                  'text' => 'E'
+                                }
+                              ],
+                              'type' => 'following_arg'
                             }
                           ],
-                          'type' => 'following_arg'
+                          'source_info' => {
+                            'line_nr' => 70
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 70
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 70
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => ',',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 70
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => ',',
                   'contents' => [
                     {
-                      'cmdname' => '\'',
                       'contents' => [
                         {
+                          'cmdname' => '\'',
                           'contents' => [
                             {
-                              'text' => 'C'
+                              'contents' => [
+                                {
+                                  'text' => 'C'
+                                }
+                              ],
+                              'type' => 'following_arg'
                             }
                           ],
-                          'type' => 'following_arg'
+                          'source_info' => {
+                            'line_nr' => 70
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 70
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 70
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 70
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_0131-_1e14-_1e08'
@@ -6586,101 +6687,104 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'dotless',
               'contents' => [
                 {
+                  'cmdname' => 'dotless',
                   'contents' => [
                     {
-                      'text' => 'i'
+                      'contents' => [
+                        {
+                          'text' => 'i'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 71
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '`',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 71
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '`',
                   'contents' => [
                     {
-                      'cmdname' => '=',
                       'contents' => [
                         {
+                          'cmdname' => '=',
                           'contents' => [
                             {
-                              'text' => 'E'
+                              'contents' => [
+                                {
+                                  'text' => 'E'
+                                }
+                              ],
+                              'type' => 'following_arg'
                             }
-                          ],
-                          'type' => 'following_arg'
-                        }
-                      ],
-                      'source_info' => {
-                        'line_nr' => 71
-                      }
-                    }
-                  ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 71
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => ',',
-              'contents' => [
+                          ],
+                          'source_info' => {
+                            'line_nr' => 71
+                          }
+                        }
+                      ],
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 71
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => ',',
                   'contents' => [
                     {
-                      'cmdname' => '\'',
                       'contents' => [
                         {
+                          'cmdname' => '\'',
                           'contents' => [
                             {
-                              'text' => 'C'
+                              'contents' => [
+                                {
+                                  'text' => 'C'
+                                }
+                              ],
+                              'type' => 'following_arg'
                             }
                           ],
-                          'type' => 'following_arg'
+                          'source_info' => {
+                            'line_nr' => 71
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 71
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 71
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 71
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -6700,101 +6804,106 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'quotedblleft',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 73
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'quotedblright',
-              'contents' => [
+                  'cmdname' => 'quotedblleft',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 73
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 73
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'quoteleft',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 73
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'quoteright',
-              'contents' => [
+                  'cmdname' => 'quotedblright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 73
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 73
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'quotedblbase',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 73
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'quotesinglbase',
-              'contents' => [
+                  'cmdname' => 'quoteleft',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 73
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'quoteright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 73
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'quotedblbase',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 73
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'quotesinglbase',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 73
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 73
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
@@ -6809,102 +6918,105 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'quotedblleft',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 74
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'quotedblright',
-              'contents' => [
+                  'cmdname' => 'quotedblleft',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 74
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 74
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'quoteleft',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 74
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'quoteright',
-              'contents' => [
+                  'cmdname' => 'quotedblright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 74
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 74
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'quotedblbase',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 74
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'quotesinglbase',
-              'contents' => [
+                  'cmdname' => 'quoteleft',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 74
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'quoteright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 74
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'quotedblbase',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 74
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'quotesinglbase',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 74
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 74
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+                }
+              },
+              'type' => 'line_arg'
+            }
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -6924,101 +7036,106 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'guillemetleft',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 76
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'guillemetright',
-              'contents' => [
+                  'cmdname' => 'guillemetleft',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 76
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 76
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'guillemotleft',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 76
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'guillemotright',
-              'contents' => [
+                  'cmdname' => 'guillemetright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 76
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 76
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'guilsinglleft',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 76
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'guilsinglright',
-              'contents' => [
+                  'cmdname' => 'guillemotleft',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 76
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'guillemotright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 76
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'guilsinglleft',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 76
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'guilsinglright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 76
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 76
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
@@ -7033,102 +7150,105 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'guillemetleft',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 77
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'guillemetright',
-              'contents' => [
+                  'cmdname' => 'guillemetleft',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 77
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 77
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'guillemotleft',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 77
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'guillemotright',
-              'contents' => [
+                  'cmdname' => 'guillemetright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 77
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 77
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'guilsinglleft',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 77
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'guilsinglright',
-              'contents' => [
+                  'cmdname' => 'guillemotleft',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 77
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'guillemotright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 77
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'guilsinglleft',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 77
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'guilsinglright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 77
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 77
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -7148,23 +7268,28 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '`` \'\' --- -- ` \''
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => '`` \'\' --- -- ` \''
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
@@ -7177,26 +7302,29 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       'source_info' => {
         'line_nr' => 79
       }
-    },
-    {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => '`` \'\' --- -- ` \''
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
+    },
+    {
       'cmdname' => 'chapter',
       'contents' => [
+        {
+          'contents' => [
+            {
+              'contents' => [
+                {
+                  'text' => '`` \'\' --- -- ` \''
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
+              },
+              'type' => 'line_arg'
+            }
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -7216,87 +7344,92 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'acronym',
               'contents' => [
                 {
+                  'cmdname' => 'acronym',
                   'contents' => [
                     {
-                      'text' => 'AAA'
+                      'contents' => [
+                        {
+                          'text' => 'AAA'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'fff'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 82
+                  }
                 },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'fff'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 82
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'acronym',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'acronym',
                   'contents' => [
                     {
-                      'text' => 'AAA'
+                      'contents' => [
+                        {
+                          'text' => 'AAA'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 82
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'acronym',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 82
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'acronym',
                   'contents' => [
                     {
-                      'text' => 'BBB'
+                      'contents' => [
+                        {
+                          'text' => 'BBB'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 82
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 82
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'AAA-AAA-BBB'
@@ -7311,88 +7444,91 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'acronym',
               'contents' => [
                 {
+                  'cmdname' => 'acronym',
                   'contents' => [
                     {
-                      'text' => 'AAA'
+                      'contents' => [
+                        {
+                          'text' => 'AAA'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'fff'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 83
+                  }
                 },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'fff'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 83
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'acronym',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'acronym',
                   'contents' => [
                     {
-                      'text' => 'AAA'
+                      'contents' => [
+                        {
+                          'text' => 'AAA'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 83
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'acronym',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 83
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'acronym',
                   'contents' => [
                     {
-                      'text' => 'BBB'
+                      'contents' => [
+                        {
+                          'text' => 'BBB'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 83
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 83
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -7412,89 +7548,89 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'abbr',
               'contents' => [
                 {
+                  'cmdname' => 'abbr',
                   'contents' => [
                     {
-                      'text' => 'CCC'
+                      'contents' => [
+                        {
+                          'text' => 'CCC'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'rrr'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 85
+                  }
                 },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'rrr'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 85
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'abbr',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'abbr',
                   'contents' => [
                     {
-                      'text' => 'CCC'
+                      'contents' => [
+                        {
+                          'text' => 'CCC'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 85
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'abbr',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 85
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'abbr',
                   'contents' => [
                     {
-                      'text' => 'DDD'
+                      'contents' => [
+                        {
+                          'text' => 'DDD'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 85
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 85
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
-        {
+          ],
           'source_marks' => [
             {
               'counter' => 1,
@@ -7524,7 +7660,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'status' => 'start'
             }
           ],
-          'text' => ''
+          'type' => 'argument'
         }
       ],
       'extra' => {
@@ -7541,89 +7677,89 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'abbr',
               'contents' => [
                 {
+                  'cmdname' => 'abbr',
                   'contents' => [
                     {
-                      'text' => 'CCC'
-                    }
-                  ],
-                  'type' => 'brace_arg'
-                },
-                {
-                  'contents' => [
-                    {
-                      'text' => 'rrr'
+                      'contents' => [
+                        {
+                          'text' => 'CCC'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'rrr'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 87
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'abbr',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 87
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'abbr',
                   'contents' => [
                     {
-                      'text' => 'CCC'
+                      'contents' => [
+                        {
+                          'text' => 'CCC'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 87
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'abbr',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 87
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'abbr',
                   'contents' => [
                     {
-                      'text' => 'DDD'
+                      'contents' => [
+                        {
+                          'text' => 'DDD'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 87
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 87
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
-        {
+          ],
           'source_marks' => [
             {
               'counter' => 1,
@@ -7661,7 +7797,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'status' => 'end'
             }
           ],
-          'text' => ''
+          'type' => 'argument'
         },
         {
           'text' => '
@@ -7682,80 +7818,85 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'email',
               'contents' => [
                 {
+                  'cmdname' => 'email',
                   'contents' => [
                     {
-                      'text' => 'someone'
-                    },
-                    {
-                      'cmdname' => '@'
+                      'contents' => [
+                        {
+                          'text' => 'someone'
+                        },
+                        {
+                          'cmdname' => '@'
+                        },
+                        {
+                          'text' => 'somewher'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     },
                     {
-                      'text' => 'somewher'
+                      'contents' => [
+                        {
+                          'text' => 'the someone'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 90
+                  }
                 },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'the someone'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 90
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'email',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'email',
                   'contents' => [
                     {
-                      'text' => 'no_explain'
-                    },
-                    {
-                      'cmdname' => '@'
-                    },
-                    {
-                      'text' => 'there'
+                      'contents' => [
+                        {
+                          'text' => 'no_explain'
+                        },
+                        {
+                          'cmdname' => '@'
+                        },
+                        {
+                          'text' => 'there'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 90
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 90
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'someone_0040somewher-no_005fexplain_0040there'
@@ -7770,81 +7911,84 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'email',
               'contents' => [
                 {
+                  'cmdname' => 'email',
                   'contents' => [
                     {
-                      'text' => 'someone'
-                    },
-                    {
-                      'cmdname' => '@'
+                      'contents' => [
+                        {
+                          'text' => 'someone'
+                        },
+                        {
+                          'cmdname' => '@'
+                        },
+                        {
+                          'text' => 'somewher'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     },
                     {
-                      'text' => 'somewher'
+                      'contents' => [
+                        {
+                          'text' => 'the someone'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 91
+                  }
                 },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'the someone'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 91
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'email',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'email',
                   'contents' => [
                     {
-                      'text' => 'no_explain'
-                    },
-                    {
-                      'cmdname' => '@'
-                    },
-                    {
-                      'text' => 'there'
+                      'contents' => [
+                        {
+                          'text' => 'no_explain'
+                        },
+                        {
+                          'cmdname' => '@'
+                        },
+                        {
+                          'text' => 'there'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 91
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 91
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -7864,95 +8008,95 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'image',
-              'contents' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'f--ile1'
-                    }
-                  ],
-                  'type' => 'brace_arg'
-                }
-              ],
-              'extra' => {
-                'input_encoding_name' => 'iso-8859-15'
-              },
-              'source_info' => {
-                'line_nr' => 93
-              }
-            },
-            {
-              'text' => '  '
-            },
-            {
-              'cmdname' => 'image',
-              'contents' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'f--ile'
-                    }
-                  ],
-                  'type' => 'brace_arg'
-                },
-                {
-                  'contents' => [
-                    {
-                      'text' => 'aze'
-                    }
-                  ],
-                  'type' => 'brace_arg'
-                },
-                {
-                  'contents' => [
-                    {
-                      'text' => 'az'
-                    }
-                  ],
-                  'type' => 'brace_arg'
-                },
+              'contents' => [
                 {
+                  'cmdname' => 'image',
                   'contents' => [
                     {
-                      'text' => 'alt'
+                      'contents' => [
+                        {
+                          'text' => 'f--ile1'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'extra' => {
+                    'input_encoding_name' => 'iso-8859-15'
+                  },
+                  'source_info' => {
+                    'line_nr' => 93
+                  }
+                },
+                {
+                  'text' => '  '
                 },
                 {
+                  'cmdname' => 'image',
                   'contents' => [
                     {
-                      'text' => 'e--xt'
+                      'contents' => [
+                        {
+                          'text' => 'f--ile'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'aze'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'az'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'alt'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'e--xt'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'extra' => {
+                    'input_encoding_name' => 'iso-8859-15'
+                  },
+                  'source_info' => {
+                    'line_nr' => 93
+                  }
                 }
               ],
-              'extra' => {
-                'input_encoding_name' => 'iso-8859-15'
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
               },
-              'source_info' => {
-                'line_nr' => 93
-              }
+              'type' => 'line_arg'
             }
           ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
-        {
           'source_marks' => [
             {
               'counter' => 2,
@@ -7982,7 +8126,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'status' => 'start'
             }
           ],
-          'text' => ''
+          'type' => 'argument'
         }
       ],
       'extra' => {
@@ -7999,95 +8143,95 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'image',
-              'contents' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'f--ile1'
-                    }
-                  ],
-                  'type' => 'brace_arg'
-                }
-              ],
-              'extra' => {
-                'input_encoding_name' => 'iso-8859-15'
-              },
-              'source_info' => {
-                'line_nr' => 95
-              }
-            },
-            {
-              'text' => '  '
-            },
-            {
-              'cmdname' => 'image',
               'contents' => [
                 {
+                  'cmdname' => 'image',
                   'contents' => [
                     {
-                      'text' => 'f--ile'
+                      'contents' => [
+                        {
+                          'text' => 'f--ile1'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'extra' => {
+                    'input_encoding_name' => 'iso-8859-15'
+                  },
+                  'source_info' => {
+                    'line_nr' => 95
+                  }
                 },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'aze'
-                    }
-                  ],
-                  'type' => 'brace_arg'
+                  'text' => '  '
                 },
                 {
+                  'cmdname' => 'image',
                   'contents' => [
                     {
-                      'text' => 'az'
-                    }
-                  ],
-                  'type' => 'brace_arg'
-                },
-                {
-                  'contents' => [
+                      'contents' => [
+                        {
+                          'text' => 'f--ile'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
                     {
-                      'text' => 'alt'
-                    }
-                  ],
-                  'type' => 'brace_arg'
-                },
-                {
-                  'contents' => [
+                      'contents' => [
+                        {
+                          'text' => 'aze'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'az'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'alt'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
                     {
-                      'text' => 'e--xt'
+                      'contents' => [
+                        {
+                          'text' => 'e--xt'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'extra' => {
+                    'input_encoding_name' => 'iso-8859-15'
+                  },
+                  'source_info' => {
+                    'line_nr' => 95
+                  }
                 }
               ],
-              'extra' => {
-                'input_encoding_name' => 'iso-8859-15'
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
               },
-              'source_info' => {
-                'line_nr' => 95
-              }
+              'type' => 'line_arg'
             }
           ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
-        {
           'source_marks' => [
             {
               'counter' => 2,
@@ -8125,7 +8269,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'status' => 'end'
             }
           ],
-          'text' => ''
+          'type' => 'argument'
         },
         {
           'text' => '
@@ -8146,42 +8290,42 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'verb',
               'contents' => [
                 {
+                  'cmdname' => 'verb',
                   'contents' => [
                     {
-                      'text' => ' @ {} . ',
-                      'type' => 'raw'
+                      'contents' => [
+                        {
+                          'text' => ' @ {} . ',
+                          'type' => 'raw'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'info' => {
+                    'delimiter' => '.'
+                  },
+                  'source_info' => {
+                    'line_nr' => 98
+                  }
                 }
               ],
               'info' => {
-                'delimiter' => '.'
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
               },
-              'source_info' => {
-                'line_nr' => 98
-              }
+              'type' => 'line_arg'
             }
           ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
-        {
           'source_marks' => [
             {
               'counter' => 3,
@@ -8211,7 +8355,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'status' => 'start'
             }
           ],
-          'text' => ''
+          'type' => 'argument'
         }
       ],
       'extra' => {
@@ -8228,42 +8372,42 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'verb',
               'contents' => [
                 {
+                  'cmdname' => 'verb',
                   'contents' => [
                     {
-                      'text' => ' @ {} . ',
-                      'type' => 'raw'
+                      'contents' => [
+                        {
+                          'text' => ' @ {} . ',
+                          'type' => 'raw'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'info' => {
+                    'delimiter' => '.'
+                  },
+                  'source_info' => {
+                    'line_nr' => 100
+                  }
                 }
               ],
               'info' => {
-                'delimiter' => '.'
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
               },
-              'source_info' => {
-                'line_nr' => 100
-              }
+              'type' => 'line_arg'
             }
           ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
-        {
           'source_marks' => [
             {
               'counter' => 3,
@@ -8301,7 +8445,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               'status' => 'end'
             }
           ],
-          'text' => ''
+          'type' => 'argument'
         },
         {
           'text' => '
@@ -8322,226 +8466,231 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'cite',
               'contents' => [
                 {
+                  'cmdname' => 'cite',
                   'contents' => [
                     {
-                      'text' => 'cite '
-                    },
-                    {
-                      'cmdname' => 'asis',
                       'contents' => [
                         {
+                          'text' => 'cite '
+                        },
+                        {
+                          'cmdname' => 'asis',
                           'contents' => [
                             {
-                              'text' => 'asis'
+                              'contents' => [
+                                {
+                                  'text' => 'asis'
+                                }
+                              ],
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'brace_container'
+                          'source_info' => {
+                            'line_nr' => 103
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 103
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 103
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'w',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 103
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'w',
                   'contents' => [
                     {
-                      'text' => 'in '
-                    },
-                    {
-                      'cmdname' => '@'
-                    },
-                    {
-                      'text' => 'w '
-                    },
-                    {
-                      'cmdname' => 'b',
                       'contents' => [
                         {
+                          'text' => 'in '
+                        },
+                        {
+                          'cmdname' => '@'
+                        },
+                        {
+                          'text' => 'w '
+                        },
+                        {
+                          'cmdname' => 'b',
                           'contents' => [
                             {
-                              'text' => 'b'
+                              'contents' => [
+                                {
+                                  'text' => 'b'
+                                }
+                              ],
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'brace_container'
-                        }
-                      ],
-                      'source_info' => {
-                        'line_nr' => 103
-                      }
-                    }
-                  ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 103
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'r',
-              'contents' => [
+                          'source_info' => {
+                            'line_nr' => 103
+                          }
+                        }
+                      ],
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 103
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'r',
                   'contents' => [
                     {
-                      'text' => 'in r'
+                      'contents' => [
+                        {
+                          'text' => 'in r'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 103
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'sc',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 103
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'sc',
                   'contents' => [
                     {
-                      'text' => 'sc'
+                      'contents' => [
+                        {
+                          'text' => 'sc'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 103
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'strong',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 103
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'strong',
                   'contents' => [
                     {
-                      'text' => 'str'
+                      'contents' => [
+                        {
+                          'text' => 'str'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 103
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 't',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 103
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 't',
                   'contents' => [
                     {
-                      'text' => 't'
+                      'contents' => [
+                        {
+                          'text' => 't'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 103
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'var',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 103
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'var',
                   'contents' => [
                     {
-                      'text' => 'var'
+                      'contents' => [
+                        {
+                          'text' => 'var'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 103
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'dfn',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 103
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'dfn',
                   'contents' => [
                     {
-                      'text' => 'dfn'
+                      'contents' => [
+                        {
+                          'text' => 'dfn'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 103
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'i',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 103
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'i',
                   'contents' => [
                     {
-                      'text' => 'i'
+                      'contents' => [
+                        {
+                          'text' => 'i'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 103
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 103
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'cite-asis-in-_0040w-b-in-r-sc-str-t-var-dfn-i'
@@ -8556,227 +8705,230 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'cite',
               'contents' => [
                 {
+                  'cmdname' => 'cite',
                   'contents' => [
                     {
-                      'text' => 'cite '
-                    },
-                    {
-                      'cmdname' => 'asis',
                       'contents' => [
                         {
+                          'text' => 'cite '
+                        },
+                        {
+                          'cmdname' => 'asis',
                           'contents' => [
                             {
-                              'text' => 'asis'
+                              'contents' => [
+                                {
+                                  'text' => 'asis'
+                                }
+                              ],
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'brace_container'
+                          'source_info' => {
+                            'line_nr' => 104
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 104
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 104
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'w',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 104
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'w',
                   'contents' => [
                     {
-                      'text' => 'in '
-                    },
-                    {
-                      'cmdname' => '@'
-                    },
-                    {
-                      'text' => 'w '
-                    },
-                    {
-                      'cmdname' => 'b',
                       'contents' => [
                         {
+                          'text' => 'in '
+                        },
+                        {
+                          'cmdname' => '@'
+                        },
+                        {
+                          'text' => 'w '
+                        },
+                        {
+                          'cmdname' => 'b',
                           'contents' => [
                             {
-                              'text' => 'b'
+                              'contents' => [
+                                {
+                                  'text' => 'b'
+                                }
+                              ],
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'brace_container'
+                          'source_info' => {
+                            'line_nr' => 104
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 104
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 104
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'r',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 104
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'r',
                   'contents' => [
                     {
-                      'text' => 'in r'
+                      'contents' => [
+                        {
+                          'text' => 'in r'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 104
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'sc',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 104
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'sc',
                   'contents' => [
                     {
-                      'text' => 'sc'
+                      'contents' => [
+                        {
+                          'text' => 'sc'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 104
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'strong',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 104
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'strong',
                   'contents' => [
                     {
-                      'text' => 'str'
+                      'contents' => [
+                        {
+                          'text' => 'str'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 104
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 't',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 104
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 't',
                   'contents' => [
                     {
-                      'text' => 't'
+                      'contents' => [
+                        {
+                          'text' => 't'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 104
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'var',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 104
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'var',
                   'contents' => [
                     {
-                      'text' => 'var'
+                      'contents' => [
+                        {
+                          'text' => 'var'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 104
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'dfn',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 104
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'dfn',
                   'contents' => [
                     {
-                      'text' => 'dfn'
+                      'contents' => [
+                        {
+                          'text' => 'dfn'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 104
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'i',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 104
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'i',
                   'contents' => [
                     {
-                      'text' => 'i'
+                      'contents' => [
+                        {
+                          'text' => 'i'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 104
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 104
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -8796,166 +8948,171 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'env',
               'contents' => [
                 {
+                  'cmdname' => 'env',
                   'contents' => [
                     {
-                      'text' => 'env'
+                      'contents' => [
+                        {
+                          'text' => 'env'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 106
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'code',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 106
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'code',
                   'contents' => [
                     {
-                      'text' => 'code'
+                      'contents' => [
+                        {
+                          'text' => 'code'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 106
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'option',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 106
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'option',
                   'contents' => [
                     {
-                      'text' => 'option'
+                      'contents' => [
+                        {
+                          'text' => 'option'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 106
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'samp',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 106
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'samp',
                   'contents' => [
                     {
-                      'text' => 'samp'
+                      'contents' => [
+                        {
+                          'text' => 'samp'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 106
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'command',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 106
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'command',
                   'contents' => [
                     {
-                      'text' => 'command'
+                      'contents' => [
+                        {
+                          'text' => 'command'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 106
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'file',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 106
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'file',
                   'contents' => [
                     {
-                      'text' => 'file'
+                      'contents' => [
+                        {
+                          'text' => 'file'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 106
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'kbd',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 106
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'kbd',
                   'contents' => [
                     {
-                      'text' => 'C-x '
-                    },
-                    {
-                      'cmdname' => 'key',
                       'contents' => [
                         {
+                          'text' => 'C-x '
+                        },
+                        {
+                          'cmdname' => 'key',
                           'contents' => [
                             {
-                              'text' => 'ESC'
+                              'contents' => [
+                                {
+                                  'text' => 'ESC'
+                                }
+                              ],
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'brace_container'
+                          'source_info' => {
+                            'line_nr' => 106
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 106
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 106
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 106
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC'
@@ -8970,167 +9127,170 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'env',
               'contents' => [
                 {
+                  'cmdname' => 'env',
                   'contents' => [
                     {
-                      'text' => 'env'
+                      'contents' => [
+                        {
+                          'text' => 'env'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 107
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'code',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 107
+                  }
+                },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'code'
-                    }
-                  ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 107
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'option',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'code',
                   'contents' => [
                     {
-                      'text' => 'option'
+                      'contents' => [
+                        {
+                          'text' => 'code'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 107
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'samp',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 107
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'option',
                   'contents' => [
                     {
-                      'text' => 'samp'
+                      'contents' => [
+                        {
+                          'text' => 'option'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 107
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'command',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 107
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'samp',
                   'contents' => [
                     {
-                      'text' => 'command'
+                      'contents' => [
+                        {
+                          'text' => 'samp'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 107
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'file',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 107
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'command',
                   'contents' => [
                     {
-                      'text' => 'file'
+                      'contents' => [
+                        {
+                          'text' => 'command'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 107
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'kbd',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 107
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'file',
                   'contents' => [
                     {
-                      'text' => 'C-x '
-                    },
+                      'contents' => [
+                        {
+                          'text' => 'file'
+                        }
+                      ],
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 107
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'kbd',
+                  'contents' => [
                     {
-                      'cmdname' => 'key',
                       'contents' => [
                         {
+                          'text' => 'C-x '
+                        },
+                        {
+                          'cmdname' => 'key',
                           'contents' => [
                             {
-                              'text' => 'ESC'
+                              'contents' => [
+                                {
+                                  'text' => 'ESC'
+                                }
+                              ],
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'brace_container'
+                          'source_info' => {
+                            'line_nr' => 107
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 107
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 107
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 107
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -9150,39 +9310,44 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '8.27'
-            },
-            {
-              'cmdname' => 'dmn',
               'contents' => [
                 {
+                  'text' => '8.27'
+                },
+                {
+                  'cmdname' => 'dmn',
                   'contents' => [
                     {
-                      'text' => 'in'
+                      'contents' => [
+                        {
+                          'text' => 'in'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 109
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 109
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '8_002e27in'
@@ -9197,40 +9362,43 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '8.27'
-            },
-            {
-              'cmdname' => 'dmn',
               'contents' => [
                 {
+                  'text' => '8.27'
+                },
+                {
+                  'cmdname' => 'dmn',
                   'contents' => [
                     {
-                      'text' => 'in'
+                      'contents' => [
+                        {
+                          'text' => 'in'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 110
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 110
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -9250,55 +9418,60 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'sansserif',
               'contents' => [
                 {
+                  'cmdname' => 'sansserif',
                   'contents' => [
                     {
-                      'text' => 'sansserif'
+                      'contents' => [
+                        {
+                          'text' => 'sansserif'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 112
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'slanted',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 112
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'slanted',
                   'contents' => [
                     {
-                      'text' => 'slanted'
+                      'contents' => [
+                        {
+                          'text' => 'slanted'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 112
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 112
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sansserif-slanted'
@@ -9313,56 +9486,59 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'sansserif',
               'contents' => [
                 {
+                  'cmdname' => 'sansserif',
                   'contents' => [
                     {
-                      'text' => 'sansserif'
+                      'contents' => [
+                        {
+                          'text' => 'sansserif'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 113
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'slanted',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 113
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'slanted',
                   'contents' => [
                     {
-                      'text' => 'slanted'
+                      'contents' => [
+                        {
+                          'text' => 'slanted'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 113
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 113
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -9382,36 +9558,41 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'indicateurl',
               'contents' => [
                 {
+                  'cmdname' => 'indicateurl',
                   'contents' => [
                     {
-                      'text' => 'indicateurl'
+                      'contents' => [
+                        {
+                          'text' => 'indicateurl'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 115
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 115
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'indicateurl'
@@ -9426,37 +9607,40 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'indicateurl',
               'contents' => [
                 {
+                  'cmdname' => 'indicateurl',
                   'contents' => [
                     {
-                      'text' => 'indicateurl'
+                      'contents' => [
+                        {
+                          'text' => 'indicateurl'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 116
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 116
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -9476,55 +9660,60 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'sub',
               'contents' => [
                 {
+                  'cmdname' => 'sub',
                   'contents' => [
                     {
-                      'text' => 'g'
+                      'contents' => [
+                        {
+                          'text' => 'g'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 118
-              }
-            },
-            {
-              'text' => 'H 3'
-            },
-            {
-              'cmdname' => 'sup',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 118
+                  }
+                },
+                {
+                  'text' => 'H 3'
+                },
                 {
+                  'cmdname' => 'sup',
                   'contents' => [
                     {
-                      'text' => 'rd'
+                      'contents' => [
+                        {
+                          'text' => 'rd'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 118
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 118
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'gH-3rd'
@@ -9539,56 +9728,59 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'sub',
               'contents' => [
                 {
+                  'cmdname' => 'sub',
                   'contents' => [
                     {
-                      'text' => 'g'
+                      'contents' => [
+                        {
+                          'text' => 'g'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 119
-              }
-            },
-            {
-              'text' => 'H 3'
-            },
-            {
-              'cmdname' => 'sup',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 119
+                  }
+                },
+                {
+                  'text' => 'H 3'
+                },
                 {
+                  'cmdname' => 'sup',
                   'contents' => [
                     {
-                      'text' => 'rd'
+                      'contents' => [
+                        {
+                          'text' => 'rd'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 119
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 119
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -9608,98 +9800,103 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'url',
               'contents' => [
                 {
+                  'cmdname' => 'url',
                   'contents' => [
                     {
-                      'text' => 'http://somewhere_aaa'
+                      'contents' => [
+                        {
+                          'text' => 'http://somewhere_aaa'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 121
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'url',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 121
+                  }
+                },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'url'
-                    }
-                  ],
-                  'type' => 'brace_arg'
+                  'text' => ' '
                 },
                 {
+                  'cmdname' => 'url',
                   'contents' => [
                     {
-                      'text' => 'text'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 121
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'uref',
-              'contents' => [
-                {
-                  'contents' => [
+                      'contents' => [
+                        {
+                          'text' => 'url'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
                     {
-                      'text' => '/man.cgi/1/ls'
+                      'contents' => [
+                        {
+                          'text' => 'text'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 121
+                  }
                 },
                 {
-                  'type' => 'brace_arg'
+                  'text' => ' '
                 },
                 {
+                  'cmdname' => 'uref',
                   'contents' => [
                     {
-                      'text' => 'ls'
+                      'contents' => [
+                        {
+                          'text' => '/man.cgi/1/ls'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'ls'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 121
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 121
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
@@ -9714,99 +9911,102 @@ $result_trees{'at_commands_in_refs_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'url',
               'contents' => [
                 {
+                  'cmdname' => 'url',
                   'contents' => [
                     {
-                      'text' => 'http://somewhere_aaa'
+                      'contents' => [
+                        {
+                          'text' => 'http://somewhere_aaa'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 122
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'url',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 122
+                  }
+                },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'url'
-                    }
-                  ],
-                  'type' => 'brace_arg'
+                  'text' => ' '
                 },
                 {
+                  'cmdname' => 'url',
                   'contents' => [
                     {
-                      'text' => 'text'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 122
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'uref',
-              'contents' => [
-                {
-                  'contents' => [
+                      'contents' => [
+                        {
+                          'text' => 'url'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
                     {
-                      'text' => '/man.cgi/1/ls'
+                      'contents' => [
+                        {
+                          'text' => 'text'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 122
+                  }
                 },
                 {
-                  'type' => 'brace_arg'
+                  'text' => ' '
                 },
                 {
+                  'cmdname' => 'uref',
                   'contents' => [
                     {
-                      'text' => 'ls'
+                      'contents' => [
+                        {
+                          'text' => '/man.cgi/1/ls'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'ls'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 122
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 122
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -13243,470 +13443,470 @@ $result_trees{'at_commands_in_refs_latin1'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[13];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[14];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[15];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[16];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[13];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[14];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[15];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[16];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[17]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[17];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[18]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[18];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[19]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[19];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[20]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[20];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[21]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[21];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[22]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[22];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[23]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[23];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[24]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[24];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[25]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[25];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[26]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[26];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[13];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[14];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[15];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[16];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[17]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[17];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[18]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[18];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[19]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[19];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[20]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[20];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[13];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[14];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[15];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[16];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[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'}[27]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[17]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[17];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[18]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[18];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[19]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[19];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[20]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[20];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[21]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[21];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[22]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[22];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[23]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[23];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[24]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[24];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[25]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[25];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[26]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[26];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[17]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[17];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[18]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[18];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[19]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[19];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[20]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[20];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[13];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[14];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[15];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[16];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[13];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[14];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[15];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[16];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[17]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[17];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[18]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[18];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[19]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[19];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[20]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[20];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[21]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[21];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[22]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[22];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[23]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[23];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[24]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[24];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[25]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[25];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[26]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[26];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[13];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[14];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[15];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[16];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[17]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[17];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[18]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[18];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[19]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[19];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[20]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[20];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[15]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[15]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[16]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[16]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[16]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[16]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[16]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[17]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[17]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[17]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[17]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[17]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[18]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[18]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[18]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[18]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[18]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[18]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[19]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[19]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[19]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[19]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[19]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[19]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[20]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[13];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[14];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[15];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[16];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[23]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[23]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[23]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[23]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[24]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[24]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[24]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[24]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[24]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[24]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[25]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[25]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[26]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[26]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[26]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[27]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[27]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[27]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[27]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[27]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[13];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[14];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[15];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[16];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[13];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[14];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[15];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[16];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[17]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[17];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[18]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[18];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[19]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[19];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[20]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[20];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[21]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[21];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[22]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[22];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[23]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[23];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[24]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[24];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[25]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[25];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[26]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[26];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[13];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[14];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[15];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[16];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[17]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[17];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[18]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[18];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[19]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[19];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[20]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[20];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[30]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[40]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[40]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[13];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[14];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[15];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[16];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[46]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[46]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[46]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[46]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[48]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[48]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[48]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[48]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[48]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[48]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[50]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[50]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[52]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[52]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[52]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[52]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[52]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[52]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[54]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[54]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[54]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[54]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[54]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[54]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[54]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[54]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[54]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[54]{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
 $result_texis{'at_commands_in_refs_latin1'} = '@setfilename 
at_commands_in_refs_latin1.info
 @documentencoding ISO-8859-15
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 13bc1d6fe1..f9c0873322 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
@@ -84,23 +84,28 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -115,24 +120,27 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3692,35 +3700,40 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => '-'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '{'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '}'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'cmdname' => '-'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '{'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '}'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '-_007b-_007d'
@@ -3735,36 +3748,39 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => '-'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '{'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '}'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'cmdname' => '-'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '{'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '}'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3784,71 +3800,76 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => ' '
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '   '
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '!'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '*'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '.'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => ':'
-            },
-            {
-              'text' => ' .'
-            },
-            {
-              'cmdname' => ':'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '?'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '@'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'cmdname' => ' '
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '       '
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '!'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '*'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '.'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => ':'
+                },
+                {
+                  'text' => ' .'
+                },
+                {
+                  'cmdname' => ':'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '?'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '@'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '-_0021-_002e-_002e-_003f-_0040'
@@ -3863,172 +3884,180 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'cmdname' => ' '
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '   '
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '!'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '*'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '.'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => ':'
-            },
-            {
-              'text' => ' .'
-            },
-            {
-              'cmdname' => ':'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '?'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '@'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
       'cmdname' => 'chapter',
       'contents' => [
-        {
-          'text' => '
-',
-          'type' => 'empty_line'
-        }
-      ],
-      'extra' => {
-        'section_number' => '2'
-      },
-      'info' => {
-        'spaces_before_argument' => {
-          'text' => ' '
-        }
-      },
-      'source_info' => {
-        'line_nr' => 41
-      }
-    },
-    {
-      'args' => [
         {
           'contents' => [
             {
-              'cmdname' => 'atchar',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 43
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'lbracechar',
-              'contents' => [
+                  'cmdname' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 43
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'rbracechar',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 43
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'backslashchar',
-              'contents' => [
+                  'cmdname' => '       '
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '!'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '*'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '.'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => ':'
+                },
+                {
+                  'text' => ' .'
+                },
+                {
+                  'cmdname' => ':'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '?'
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => '@'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 43
-              }
-            },
-            {
-              'text' => ' '
-            },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
+              },
+              'type' => 'line_arg'
+            }
+          ],
+          'type' => 'argument'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        }
+      ],
+      'extra' => {
+        'section_number' => '2'
+      },
+      'info' => {
+        'spaces_before_argument' => {
+          'text' => ' '
+        }
+      },
+      'source_info' => {
+        'line_nr' => 41
+      }
+    },
+    {
+      'cmdname' => 'node',
+      'contents' => [
+        {
+          'contents' => [
             {
-              'cmdname' => 'hashchar',
               'contents' => [
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'atchar',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 43
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'lbracechar',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 43
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'rbracechar',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 43
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'backslashchar',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 43
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'hashchar',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 43
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 43
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_0040-_007b-_007d-_005c-_0023'
@@ -4043,88 +4072,91 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'atchar',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 44
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'lbracechar',
-              'contents' => [
+                  'cmdname' => 'atchar',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 44
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 44
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'rbracechar',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 44
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'backslashchar',
-              'contents' => [
+                  'cmdname' => 'lbracechar',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 44
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 44
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'hashchar',
-              'contents' => [
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'rbracechar',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 44
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'backslashchar',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 44
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'hashchar',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 44
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 44
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -4144,115 +4176,120 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'LaTeX',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 46
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'TeX',
-              'contents' => [
+                  'cmdname' => 'LaTeX',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 46
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 46
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'bullet',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 46
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'comma',
-              'contents' => [
+                  'cmdname' => 'TeX',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 46
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 46
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'copyright',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 46
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'dots',
-              'contents' => [
+                  'cmdname' => 'bullet',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 46
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 46
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'enddots',
-              'contents' => [
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'comma',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 46
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'copyright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 46
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'dots',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 46
+                  }
+                },
                 {
-                  'type' => 'brace_container'
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'enddots',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 46
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 46
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
@@ -4267,116 +4304,119 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'LaTeX',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 47
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'TeX',
-              'contents' => [
+                  'cmdname' => 'LaTeX',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 47
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 47
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'bullet',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 47
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'comma',
-              'contents' => [
+                  'cmdname' => 'TeX',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 47
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 47
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'copyright',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 47
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'dots',
-              'contents' => [
+                  'cmdname' => 'bullet',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 47
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 47
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'enddots',
-              'contents' => [
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'comma',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 47
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'copyright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 47
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'dots',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 47
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'enddots',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 47
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 47
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -4396,101 +4436,106 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
-        {
+      'cmdname' => 'node',
+      'contents' => [
+        {
           'contents' => [
             {
-              'cmdname' => 'equiv',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 49
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'error',
-              'contents' => [
+                  'cmdname' => 'equiv',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 49
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 49
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'euro',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 49
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'exclamdown',
-              'contents' => [
+                  'cmdname' => 'error',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 49
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 49
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'expansion',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 49
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'minus',
-              'contents' => [
+                  'cmdname' => 'euro',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 49
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'exclamdown',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 49
+                  }
+                },
                 {
-                  'type' => 'brace_container'
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'expansion',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 49
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'minus',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 49
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 49
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212'
@@ -4505,102 +4550,105 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'equiv',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 50
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'error',
-              'contents' => [
+                  'cmdname' => 'equiv',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 50
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 50
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'euro',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 50
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'exclamdown',
-              'contents' => [
+                  'cmdname' => 'error',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 50
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 50
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'expansion',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 50
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'minus',
-              'contents' => [
+                  'cmdname' => 'euro',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 50
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'exclamdown',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 50
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'expansion',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 50
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'minus',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 50
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 50
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -4620,59 +4668,64 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'geq',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 52
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'leq',
-              'contents' => [
+                  'cmdname' => 'geq',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 52
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 52
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'arrow',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 52
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                  'cmdname' => 'leq',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 52
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'arrow',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 52
+                  }
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_2265-_2264-_2192'
@@ -4687,60 +4740,63 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'geq',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 53
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'leq',
-              'contents' => [
+                  'cmdname' => 'geq',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 53
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 53
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'arrow',
-              'contents' => [
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'leq',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 53
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'arrow',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 53
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 53
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -4760,115 +4816,120 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'ordf',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 55
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ordm',
-              'contents' => [
+                  'cmdname' => 'ordf',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 55
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 55
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'point',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 55
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'pounds',
-              'contents' => [
+                  'cmdname' => 'ordm',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 55
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 55
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'print',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 55
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'questiondown',
-              'contents' => [
+                  'cmdname' => 'point',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 55
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 55
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'registeredsymbol',
-              'contents' => [
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'pounds',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 55
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'print',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 55
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'questiondown',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 55
+                  }
+                },
                 {
-                  'type' => 'brace_container'
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'registeredsymbol',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 55
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 55
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_00aa-_00ba-_22c6-_00a3-_22a3-_00bf-_00ae'
@@ -4883,116 +4944,119 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'ordf',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 56
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ordm',
-              'contents' => [
+                  'cmdname' => 'ordf',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 56
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 56
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'point',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 56
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'pounds',
-              'contents' => [
+                  'cmdname' => 'ordm',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 56
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 56
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'print',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 56
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'questiondown',
-              'contents' => [
+                  'cmdname' => 'point',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 56
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 56
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'registeredsymbol',
-              'contents' => [
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'pounds',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 56
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'print',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 56
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'questiondown',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 56
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'registeredsymbol',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 56
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 56
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -5012,87 +5076,92 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'result',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 58
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'textdegree',
-              'contents' => [
+                  'cmdname' => 'result',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 58
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 58
-              }
-            },
-            {
-              'text' => ' a'
-            },
-            {
-              'cmdname' => 'tie',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 58
-              }
-            },
-            {
-              'text' => 'b '
-            },
-            {
-              'cmdname' => 'today',
-              'contents' => [
+                  'cmdname' => 'textdegree',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 58
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 58
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'aa',
-              'contents' => [
+                  'text' => ' a'
+                },
+                {
+                  'cmdname' => 'tie',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 58
+                  }
+                },
+                {
+                  'text' => 'b '
+                },
+                {
+                  'cmdname' => 'today',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 58
+                  }
+                },
                 {
-                  'type' => 'brace_container'
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'aa',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 58
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 58
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_21d2-_00b0-a-b-_00e5'
@@ -5107,88 +5176,91 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'result',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 59
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'textdegree',
-              'contents' => [
+                  'cmdname' => 'result',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 59
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 59
-              }
-            },
-            {
-              'text' => ' a'
-            },
-            {
-              'cmdname' => 'tie',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 59
-              }
-            },
-            {
-              'text' => 'b '
-            },
-            {
-              'cmdname' => 'today',
-              'contents' => [
+                  'cmdname' => 'textdegree',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 59
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 59
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'aa',
-              'contents' => [
+                  'text' => ' a'
+                },
+                {
+                  'cmdname' => 'tie',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 59
+                  }
+                },
+                {
+                  'text' => 'b '
+                },
+                {
+                  'cmdname' => 'today',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 59
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'aa',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 59
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 59
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -5208,435 +5280,443 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'AA',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ae',
-              'contents' => [
+                  'cmdname' => 'AA',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'oe',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'AE',
-              'contents' => [
+                  'cmdname' => 'ae',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'OE',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'o',
-              'contents' => [
+                  'cmdname' => 'oe',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'O',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ss',
-              'contents' => [
+                  'cmdname' => 'AE',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'l',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'L',
-              'contents' => [
+                  'cmdname' => 'OE',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'DH',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'dh',
-              'contents' => [
+                  'cmdname' => 'o',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
                 {
-                  'type' => 'brace_container'
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'O',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'ss',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'l',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'L',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'DH',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'dh',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'TH',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'th',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 61
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => ' 
+'
+                }
+              },
+              'type' => 'line_arg'
+            }
+          ],
+          'type' => 'argument'
+        }
+      ],
+      'extra' => {
+        'is_target' => 1,
+        'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
+      },
+      'info' => {
+        'spaces_before_argument' => {
+          'text' => ' '
+        }
+      },
+      'source_info' => {
+        'line_nr' => 61
+      }
+    },
+    {
+      'cmdname' => 'chapter',
+      'contents' => [
+        {
+          'contents' => [
             {
-              'cmdname' => 'TH',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'th',
-              'contents' => [
+                  'cmdname' => 'AA',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'ae',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'oe',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'AE',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'OE',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'o',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 61
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => ' 
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'extra' => {
-        'is_target' => 1,
-        'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
-      },
-      'info' => {
-        'spaces_before_argument' => {
-          'text' => ' '
-        }
-      },
-      'source_info' => {
-        'line_nr' => 61
-      }
-    },
-    {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'cmdname' => 'AA',
-              'contents' => [
+                  'cmdname' => 'O',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ae',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'oe',
-              'contents' => [
+                  'cmdname' => 'ss',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'AE',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'OE',
-              'contents' => [
+                  'cmdname' => 'l',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'o',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'O',
-              'contents' => [
+                  'cmdname' => 'L',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ss',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'l',
-              'contents' => [
+                  'cmdname' => 'DH',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'L',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'DH',
-              'contents' => [
+                  'cmdname' => 'dh',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'dh',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'TH',
-              'contents' => [
+                  'cmdname' => 'TH',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'th',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'th',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 62
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 62
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => ' 
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => ' 
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -5656,239 +5736,244 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => '"',
               'contents' => [
                 {
+                  'cmdname' => '"',
                   'contents' => [
                     {
-                      'text' => 'a'
-                    }
-                  ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 64
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '~',
-              'contents' => [
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 64
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '~',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 64
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '^',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 64
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '^',
                   'contents' => [
                     {
-                      'cmdname' => 'dotless',
                       'contents' => [
                         {
+                          'cmdname' => 'dotless',
                           'contents' => [
                             {
-                              'text' => 'i'
+                              'contents' => [
+                                {
+                                  'text' => 'i'
+                                }
+                              ],
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'brace_container'
+                          'source_info' => {
+                            'line_nr' => 64
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 64
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 64
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '^',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 64
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '^',
                   'contents' => [
                     {
-                      'text' => 'a'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 64
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '`',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 64
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '`',
                   'contents' => [
                     {
-                      'text' => 'a'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 64
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '\'',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 64
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '\'',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'following_arg'
                     }
                   ],
-                  'type' => 'following_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 64
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => ',',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 64
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => ',',
                   'contents' => [
                     {
-                      'text' => 'c'
+                      'contents' => [
+                        {
+                          'text' => 'c'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 64
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '=',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 64
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '=',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 64
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ringaccent',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 64
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'ringaccent',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 64
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'H',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 64
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'H',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 64
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ogonek',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 64
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'ogonek',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 64
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 64
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
@@ -5903,240 +5988,243 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => '"',
               'contents' => [
                 {
+                  'cmdname' => '"',
                   'contents' => [
                     {
-                      'text' => 'a'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 65
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '~',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 65
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '~',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 65
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '^',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 65
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '^',
                   'contents' => [
                     {
-                      'cmdname' => 'dotless',
                       'contents' => [
                         {
+                          'cmdname' => 'dotless',
                           'contents' => [
                             {
-                              'text' => 'i'
+                              'contents' => [
+                                {
+                                  'text' => 'i'
+                                }
+                              ],
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'brace_container'
+                          'source_info' => {
+                            'line_nr' => 65
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 65
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 65
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '^',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 65
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '^',
                   'contents' => [
                     {
-                      'text' => 'a'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 65
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '`',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 65
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '`',
                   'contents' => [
                     {
-                      'text' => 'a'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 65
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '\'',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 65
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '\'',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'following_arg'
                     }
                   ],
-                  'type' => 'following_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 65
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => ',',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 65
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => ',',
                   'contents' => [
                     {
-                      'text' => 'c'
+                      'contents' => [
+                        {
+                          'text' => 'c'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 65
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '=',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 65
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '=',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 65
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ringaccent',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 65
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'ringaccent',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 65
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'H',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 65
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'H',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 65
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ogonek',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 65
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'ogonek',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 65
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 65
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -6156,150 +6244,155 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'dotaccent',
               'contents' => [
                 {
+                  'cmdname' => 'dotaccent',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 67
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'u',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 67
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'u',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 67
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ubaraccent',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 67
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'ubaraccent',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 67
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'udotaccent',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 67
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'udotaccent',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 67
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'v',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 67
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'v',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 67
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'dotless',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 67
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'dotless',
                   'contents' => [
                     {
-                      'text' => 'j'
+                      'contents' => [
+                        {
+                          'text' => 'j'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 67
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'tieaccent',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 67
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'tieaccent',
                   'contents' => [
                     {
-                      'text' => 'ee'
+                      'contents' => [
+                        {
+                          'text' => 'ee'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 67
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 67
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-_0237-e_0361e'
@@ -6314,151 +6407,154 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'dotaccent',
               'contents' => [
                 {
+                  'cmdname' => 'dotaccent',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 68
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'u',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 68
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'u',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 68
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'ubaraccent',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 68
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'ubaraccent',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 68
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'udotaccent',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 68
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'udotaccent',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 68
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'v',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 68
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'v',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 68
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'dotless',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 68
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'dotless',
                   'contents' => [
                     {
-                      'text' => 'j'
+                      'contents' => [
+                        {
+                          'text' => 'j'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 68
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'tieaccent',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 68
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'tieaccent',
                   'contents' => [
                     {
-                      'text' => 'ee'
+                      'contents' => [
+                        {
+                          'text' => 'ee'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 68
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 68
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -6478,100 +6574,105 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'dotless',
               'contents' => [
                 {
+                  'cmdname' => 'dotless',
                   'contents' => [
                     {
-                      'text' => 'i'
+                      'contents' => [
+                        {
+                          'text' => 'i'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 70
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '`',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 70
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '`',
                   'contents' => [
                     {
-                      'cmdname' => '=',
                       'contents' => [
                         {
+                          'cmdname' => '=',
                           'contents' => [
                             {
-                              'text' => 'E'
+                              'contents' => [
+                                {
+                                  'text' => 'E'
+                                }
+                              ],
+                              'type' => 'following_arg'
                             }
                           ],
-                          'type' => 'following_arg'
+                          'source_info' => {
+                            'line_nr' => 70
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 70
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 70
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => ',',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 70
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => ',',
                   'contents' => [
                     {
-                      'cmdname' => '\'',
                       'contents' => [
                         {
+                          'cmdname' => '\'',
                           'contents' => [
                             {
-                              'text' => 'C'
+                              'contents' => [
+                                {
+                                  'text' => 'C'
+                                }
+                              ],
+                              'type' => 'following_arg'
                             }
                           ],
-                          'type' => 'following_arg'
+                          'source_info' => {
+                            'line_nr' => 70
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 70
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 70
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 70
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_0131-_1e14-_1e08'
@@ -6586,101 +6687,104 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'dotless',
               'contents' => [
                 {
+                  'cmdname' => 'dotless',
                   'contents' => [
                     {
-                      'text' => 'i'
+                      'contents' => [
+                        {
+                          'text' => 'i'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 71
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '`',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 71
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '`',
                   'contents' => [
                     {
-                      'cmdname' => '=',
                       'contents' => [
                         {
+                          'cmdname' => '=',
                           'contents' => [
                             {
-                              'text' => 'E'
+                              'contents' => [
+                                {
+                                  'text' => 'E'
+                                }
+                              ],
+                              'type' => 'following_arg'
                             }
-                          ],
-                          'type' => 'following_arg'
-                        }
-                      ],
-                      'source_info' => {
-                        'line_nr' => 71
-                      }
-                    }
-                  ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 71
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => ',',
-              'contents' => [
+                          ],
+                          'source_info' => {
+                            'line_nr' => 71
+                          }
+                        }
+                      ],
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 71
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => ',',
                   'contents' => [
                     {
-                      'cmdname' => '\'',
                       'contents' => [
                         {
+                          'cmdname' => '\'',
                           'contents' => [
                             {
-                              'text' => 'C'
+                              'contents' => [
+                                {
+                                  'text' => 'C'
+                                }
+                              ],
+                              'type' => 'following_arg'
                             }
                           ],
-                          'type' => 'following_arg'
+                          'source_info' => {
+                            'line_nr' => 71
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 71
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 71
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 71
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -6700,101 +6804,106 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'quotedblleft',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 73
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'quotedblright',
-              'contents' => [
+                  'cmdname' => 'quotedblleft',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 73
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 73
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'quoteleft',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 73
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'quoteright',
-              'contents' => [
+                  'cmdname' => 'quotedblright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 73
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 73
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'quotedblbase',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 73
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'quotesinglbase',
-              'contents' => [
+                  'cmdname' => 'quoteleft',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 73
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'quoteright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 73
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'quotedblbase',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 73
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'quotesinglbase',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 73
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 73
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
@@ -6809,102 +6918,105 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'quotedblleft',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 74
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'quotedblright',
-              'contents' => [
+                  'cmdname' => 'quotedblleft',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 74
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 74
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'quoteleft',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 74
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'quoteright',
-              'contents' => [
+                  'cmdname' => 'quotedblright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 74
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 74
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'quotedblbase',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 74
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'quotesinglbase',
-              'contents' => [
+                  'cmdname' => 'quoteleft',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 74
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'quoteright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 74
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'quotedblbase',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 74
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'quotesinglbase',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 74
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 74
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+                }
+              },
+              'type' => 'line_arg'
+            }
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -6924,101 +7036,106 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'guillemetleft',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 76
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'guillemetright',
-              'contents' => [
+                  'cmdname' => 'guillemetleft',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 76
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 76
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'guillemotleft',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 76
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'guillemotright',
-              'contents' => [
+                  'cmdname' => 'guillemetright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 76
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 76
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'guilsinglleft',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 76
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'guilsinglright',
-              'contents' => [
+                  'cmdname' => 'guillemotleft',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 76
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'guillemotright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 76
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'guilsinglleft',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 76
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'guilsinglright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 76
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 76
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
@@ -7033,102 +7150,105 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'guillemetleft',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 77
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'guillemetright',
-              'contents' => [
+                  'cmdname' => 'guillemetleft',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 77
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 77
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'guillemotleft',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 77
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'guillemotright',
-              'contents' => [
+                  'cmdname' => 'guillemetright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 77
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 77
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'guilsinglleft',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 77
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'guilsinglright',
-              'contents' => [
+                  'cmdname' => 'guillemotleft',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 77
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'guillemotright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 77
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'guilsinglleft',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 77
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'guilsinglright',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 77
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 77
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -7148,23 +7268,28 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '`` \'\' --- -- ` \''
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => '`` \'\' --- -- ` \''
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027'
@@ -7177,26 +7302,29 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       'source_info' => {
         'line_nr' => 79
       }
-    },
-    {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => '`` \'\' --- -- ` \''
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
+    },
+    {
       'cmdname' => 'chapter',
       'contents' => [
+        {
+          'contents' => [
+            {
+              'contents' => [
+                {
+                  'text' => '`` \'\' --- -- ` \''
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
+              },
+              'type' => 'line_arg'
+            }
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -7216,87 +7344,92 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'acronym',
               'contents' => [
                 {
+                  'cmdname' => 'acronym',
                   'contents' => [
                     {
-                      'text' => 'AAA'
+                      'contents' => [
+                        {
+                          'text' => 'AAA'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'fff'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 82
+                  }
                 },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'fff'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 82
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'acronym',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'acronym',
                   'contents' => [
                     {
-                      'text' => 'AAA'
+                      'contents' => [
+                        {
+                          'text' => 'AAA'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 82
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'acronym',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 82
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'acronym',
                   'contents' => [
                     {
-                      'text' => 'BBB'
+                      'contents' => [
+                        {
+                          'text' => 'BBB'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 82
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 82
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'AAA-AAA-BBB'
@@ -7311,88 +7444,91 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'acronym',
               'contents' => [
                 {
+                  'cmdname' => 'acronym',
                   'contents' => [
                     {
-                      'text' => 'AAA'
+                      'contents' => [
+                        {
+                          'text' => 'AAA'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'fff'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 83
+                  }
                 },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'fff'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 83
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'acronym',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'acronym',
                   'contents' => [
                     {
-                      'text' => 'AAA'
+                      'contents' => [
+                        {
+                          'text' => 'AAA'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 83
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'acronym',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 83
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'acronym',
                   'contents' => [
                     {
-                      'text' => 'BBB'
+                      'contents' => [
+                        {
+                          'text' => 'BBB'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 83
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 83
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -7412,89 +7548,89 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'abbr',
               'contents' => [
                 {
+                  'cmdname' => 'abbr',
                   'contents' => [
                     {
-                      'text' => 'CCC'
+                      'contents' => [
+                        {
+                          'text' => 'CCC'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'rrr'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 85
+                  }
                 },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'rrr'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 85
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'abbr',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'abbr',
                   'contents' => [
                     {
-                      'text' => 'CCC'
+                      'contents' => [
+                        {
+                          'text' => 'CCC'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 85
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'abbr',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 85
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'abbr',
                   'contents' => [
                     {
-                      'text' => 'DDD'
+                      'contents' => [
+                        {
+                          'text' => 'DDD'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 85
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 85
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
-        {
+          ],
           'source_marks' => [
             {
               'counter' => 1,
@@ -7524,7 +7660,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'status' => 'start'
             }
           ],
-          'text' => ''
+          'type' => 'argument'
         }
       ],
       'extra' => {
@@ -7541,89 +7677,89 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'abbr',
               'contents' => [
                 {
+                  'cmdname' => 'abbr',
                   'contents' => [
                     {
-                      'text' => 'CCC'
-                    }
-                  ],
-                  'type' => 'brace_arg'
-                },
-                {
-                  'contents' => [
-                    {
-                      'text' => 'rrr'
+                      'contents' => [
+                        {
+                          'text' => 'CCC'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'rrr'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 87
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'abbr',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 87
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'abbr',
                   'contents' => [
                     {
-                      'text' => 'CCC'
+                      'contents' => [
+                        {
+                          'text' => 'CCC'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 87
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'abbr',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 87
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'abbr',
                   'contents' => [
                     {
-                      'text' => 'DDD'
+                      'contents' => [
+                        {
+                          'text' => 'DDD'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 87
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 87
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
-        {
+          ],
           'source_marks' => [
             {
               'counter' => 1,
@@ -7661,7 +7797,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'status' => 'end'
             }
           ],
-          'text' => ''
+          'type' => 'argument'
         },
         {
           'text' => '
@@ -7682,80 +7818,85 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'email',
               'contents' => [
                 {
+                  'cmdname' => 'email',
                   'contents' => [
                     {
-                      'text' => 'someone'
-                    },
-                    {
-                      'cmdname' => '@'
+                      'contents' => [
+                        {
+                          'text' => 'someone'
+                        },
+                        {
+                          'cmdname' => '@'
+                        },
+                        {
+                          'text' => 'somewher'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     },
                     {
-                      'text' => 'somewher'
+                      'contents' => [
+                        {
+                          'text' => 'the someone'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 90
+                  }
                 },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'the someone'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 90
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'email',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'email',
                   'contents' => [
                     {
-                      'text' => 'no_explain'
-                    },
-                    {
-                      'cmdname' => '@'
-                    },
-                    {
-                      'text' => 'there'
+                      'contents' => [
+                        {
+                          'text' => 'no_explain'
+                        },
+                        {
+                          'cmdname' => '@'
+                        },
+                        {
+                          'text' => 'there'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 90
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 90
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'someone_0040somewher-no_005fexplain_0040there'
@@ -7770,81 +7911,84 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'email',
               'contents' => [
                 {
+                  'cmdname' => 'email',
                   'contents' => [
                     {
-                      'text' => 'someone'
-                    },
-                    {
-                      'cmdname' => '@'
+                      'contents' => [
+                        {
+                          'text' => 'someone'
+                        },
+                        {
+                          'cmdname' => '@'
+                        },
+                        {
+                          'text' => 'somewher'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     },
                     {
-                      'text' => 'somewher'
+                      'contents' => [
+                        {
+                          'text' => 'the someone'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 91
+                  }
                 },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'the someone'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 91
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'email',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'email',
                   'contents' => [
                     {
-                      'text' => 'no_explain'
-                    },
-                    {
-                      'cmdname' => '@'
-                    },
-                    {
-                      'text' => 'there'
+                      'contents' => [
+                        {
+                          'text' => 'no_explain'
+                        },
+                        {
+                          'cmdname' => '@'
+                        },
+                        {
+                          'text' => 'there'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 91
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 91
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -7864,95 +8008,95 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'image',
-              'contents' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'f--ile1'
-                    }
-                  ],
-                  'type' => 'brace_arg'
-                }
-              ],
-              'extra' => {
-                'input_encoding_name' => 'utf-8'
-              },
-              'source_info' => {
-                'line_nr' => 93
-              }
-            },
-            {
-              'text' => '  '
-            },
-            {
-              'cmdname' => 'image',
-              'contents' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'f--ile'
-                    }
-                  ],
-                  'type' => 'brace_arg'
-                },
-                {
-                  'contents' => [
-                    {
-                      'text' => 'aze'
-                    }
-                  ],
-                  'type' => 'brace_arg'
-                },
-                {
-                  'contents' => [
-                    {
-                      'text' => 'az'
-                    }
-                  ],
-                  'type' => 'brace_arg'
-                },
+              'contents' => [
                 {
+                  'cmdname' => 'image',
                   'contents' => [
                     {
-                      'text' => 'alt'
+                      'contents' => [
+                        {
+                          'text' => 'f--ile1'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'extra' => {
+                    'input_encoding_name' => 'utf-8'
+                  },
+                  'source_info' => {
+                    'line_nr' => 93
+                  }
+                },
+                {
+                  'text' => '  '
                 },
                 {
+                  'cmdname' => 'image',
                   'contents' => [
                     {
-                      'text' => 'e--xt'
+                      'contents' => [
+                        {
+                          'text' => 'f--ile'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'aze'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'az'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'alt'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'e--xt'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'extra' => {
+                    'input_encoding_name' => 'utf-8'
+                  },
+                  'source_info' => {
+                    'line_nr' => 93
+                  }
                 }
               ],
-              'extra' => {
-                'input_encoding_name' => 'utf-8'
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
               },
-              'source_info' => {
-                'line_nr' => 93
-              }
+              'type' => 'line_arg'
             }
           ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
-        {
           'source_marks' => [
             {
               'counter' => 2,
@@ -7982,7 +8126,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'status' => 'start'
             }
           ],
-          'text' => ''
+          'type' => 'argument'
         }
       ],
       'extra' => {
@@ -7999,95 +8143,95 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'image',
-              'contents' => [
-                {
-                  'contents' => [
-                    {
-                      'text' => 'f--ile1'
-                    }
-                  ],
-                  'type' => 'brace_arg'
-                }
-              ],
-              'extra' => {
-                'input_encoding_name' => 'utf-8'
-              },
-              'source_info' => {
-                'line_nr' => 95
-              }
-            },
-            {
-              'text' => '  '
-            },
-            {
-              'cmdname' => 'image',
               'contents' => [
                 {
+                  'cmdname' => 'image',
                   'contents' => [
                     {
-                      'text' => 'f--ile'
+                      'contents' => [
+                        {
+                          'text' => 'f--ile1'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'extra' => {
+                    'input_encoding_name' => 'utf-8'
+                  },
+                  'source_info' => {
+                    'line_nr' => 95
+                  }
                 },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'aze'
-                    }
-                  ],
-                  'type' => 'brace_arg'
+                  'text' => '  '
                 },
                 {
+                  'cmdname' => 'image',
                   'contents' => [
                     {
-                      'text' => 'az'
-                    }
-                  ],
-                  'type' => 'brace_arg'
-                },
-                {
-                  'contents' => [
+                      'contents' => [
+                        {
+                          'text' => 'f--ile'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
                     {
-                      'text' => 'alt'
-                    }
-                  ],
-                  'type' => 'brace_arg'
-                },
-                {
-                  'contents' => [
+                      'contents' => [
+                        {
+                          'text' => 'aze'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'az'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'alt'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
                     {
-                      'text' => 'e--xt'
+                      'contents' => [
+                        {
+                          'text' => 'e--xt'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'extra' => {
+                    'input_encoding_name' => 'utf-8'
+                  },
+                  'source_info' => {
+                    'line_nr' => 95
+                  }
                 }
               ],
-              'extra' => {
-                'input_encoding_name' => 'utf-8'
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
               },
-              'source_info' => {
-                'line_nr' => 95
-              }
+              'type' => 'line_arg'
             }
           ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
-        {
           'source_marks' => [
             {
               'counter' => 2,
@@ -8125,7 +8269,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'status' => 'end'
             }
           ],
-          'text' => ''
+          'type' => 'argument'
         },
         {
           'text' => '
@@ -8146,42 +8290,42 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'verb',
               'contents' => [
                 {
+                  'cmdname' => 'verb',
                   'contents' => [
                     {
-                      'text' => ' @ {} . ',
-                      'type' => 'raw'
+                      'contents' => [
+                        {
+                          'text' => ' @ {} . ',
+                          'type' => 'raw'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'info' => {
+                    'delimiter' => '.'
+                  },
+                  'source_info' => {
+                    'line_nr' => 98
+                  }
                 }
               ],
               'info' => {
-                'delimiter' => '.'
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
               },
-              'source_info' => {
-                'line_nr' => 98
-              }
+              'type' => 'line_arg'
             }
           ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
-        {
           'source_marks' => [
             {
               'counter' => 3,
@@ -8211,7 +8355,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'status' => 'start'
             }
           ],
-          'text' => ''
+          'type' => 'argument'
         }
       ],
       'extra' => {
@@ -8228,42 +8372,42 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'verb',
               'contents' => [
                 {
+                  'cmdname' => 'verb',
                   'contents' => [
                     {
-                      'text' => ' @ {} . ',
-                      'type' => 'raw'
+                      'contents' => [
+                        {
+                          'text' => ' @ {} . ',
+                          'type' => 'raw'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'info' => {
+                    'delimiter' => '.'
+                  },
+                  'source_info' => {
+                    'line_nr' => 100
+                  }
                 }
               ],
               'info' => {
-                'delimiter' => '.'
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
               },
-              'source_info' => {
-                'line_nr' => 100
-              }
+              'type' => 'line_arg'
             }
           ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
-        {
           'source_marks' => [
             {
               'counter' => 3,
@@ -8301,7 +8445,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               'status' => 'end'
             }
           ],
-          'text' => ''
+          'type' => 'argument'
         },
         {
           'text' => '
@@ -8322,226 +8466,231 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'cite',
               'contents' => [
                 {
+                  'cmdname' => 'cite',
                   'contents' => [
                     {
-                      'text' => 'cite '
-                    },
-                    {
-                      'cmdname' => 'asis',
                       'contents' => [
                         {
+                          'text' => 'cite '
+                        },
+                        {
+                          'cmdname' => 'asis',
                           'contents' => [
                             {
-                              'text' => 'asis'
+                              'contents' => [
+                                {
+                                  'text' => 'asis'
+                                }
+                              ],
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'brace_container'
+                          'source_info' => {
+                            'line_nr' => 103
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 103
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 103
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'w',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 103
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'w',
                   'contents' => [
                     {
-                      'text' => 'in '
-                    },
-                    {
-                      'cmdname' => '@'
-                    },
-                    {
-                      'text' => 'w '
-                    },
-                    {
-                      'cmdname' => 'b',
                       'contents' => [
                         {
+                          'text' => 'in '
+                        },
+                        {
+                          'cmdname' => '@'
+                        },
+                        {
+                          'text' => 'w '
+                        },
+                        {
+                          'cmdname' => 'b',
                           'contents' => [
                             {
-                              'text' => 'b'
+                              'contents' => [
+                                {
+                                  'text' => 'b'
+                                }
+                              ],
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'brace_container'
-                        }
-                      ],
-                      'source_info' => {
-                        'line_nr' => 103
-                      }
-                    }
-                  ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 103
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'r',
-              'contents' => [
+                          'source_info' => {
+                            'line_nr' => 103
+                          }
+                        }
+                      ],
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 103
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'r',
                   'contents' => [
                     {
-                      'text' => 'in r'
+                      'contents' => [
+                        {
+                          'text' => 'in r'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 103
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'sc',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 103
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'sc',
                   'contents' => [
                     {
-                      'text' => 'sc'
+                      'contents' => [
+                        {
+                          'text' => 'sc'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 103
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'strong',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 103
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'strong',
                   'contents' => [
                     {
-                      'text' => 'str'
+                      'contents' => [
+                        {
+                          'text' => 'str'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 103
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 't',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 103
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 't',
                   'contents' => [
                     {
-                      'text' => 't'
+                      'contents' => [
+                        {
+                          'text' => 't'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 103
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'var',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 103
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'var',
                   'contents' => [
                     {
-                      'text' => 'var'
+                      'contents' => [
+                        {
+                          'text' => 'var'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 103
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'dfn',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 103
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'dfn',
                   'contents' => [
                     {
-                      'text' => 'dfn'
+                      'contents' => [
+                        {
+                          'text' => 'dfn'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 103
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'i',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 103
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'i',
                   'contents' => [
                     {
-                      'text' => 'i'
+                      'contents' => [
+                        {
+                          'text' => 'i'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 103
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 103
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'cite-asis-in-_0040w-b-in-r-sc-str-t-var-dfn-i'
@@ -8556,227 +8705,230 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'cite',
               'contents' => [
                 {
+                  'cmdname' => 'cite',
                   'contents' => [
                     {
-                      'text' => 'cite '
-                    },
-                    {
-                      'cmdname' => 'asis',
                       'contents' => [
                         {
+                          'text' => 'cite '
+                        },
+                        {
+                          'cmdname' => 'asis',
                           'contents' => [
                             {
-                              'text' => 'asis'
+                              'contents' => [
+                                {
+                                  'text' => 'asis'
+                                }
+                              ],
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'brace_container'
+                          'source_info' => {
+                            'line_nr' => 104
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 104
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 104
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'w',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 104
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'w',
                   'contents' => [
                     {
-                      'text' => 'in '
-                    },
-                    {
-                      'cmdname' => '@'
-                    },
-                    {
-                      'text' => 'w '
-                    },
-                    {
-                      'cmdname' => 'b',
                       'contents' => [
                         {
+                          'text' => 'in '
+                        },
+                        {
+                          'cmdname' => '@'
+                        },
+                        {
+                          'text' => 'w '
+                        },
+                        {
+                          'cmdname' => 'b',
                           'contents' => [
                             {
-                              'text' => 'b'
+                              'contents' => [
+                                {
+                                  'text' => 'b'
+                                }
+                              ],
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'brace_container'
+                          'source_info' => {
+                            'line_nr' => 104
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 104
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 104
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'r',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 104
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'r',
                   'contents' => [
                     {
-                      'text' => 'in r'
+                      'contents' => [
+                        {
+                          'text' => 'in r'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 104
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'sc',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 104
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'sc',
                   'contents' => [
                     {
-                      'text' => 'sc'
+                      'contents' => [
+                        {
+                          'text' => 'sc'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 104
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'strong',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 104
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'strong',
                   'contents' => [
                     {
-                      'text' => 'str'
+                      'contents' => [
+                        {
+                          'text' => 'str'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 104
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 't',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 104
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 't',
                   'contents' => [
                     {
-                      'text' => 't'
+                      'contents' => [
+                        {
+                          'text' => 't'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 104
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'var',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 104
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'var',
                   'contents' => [
                     {
-                      'text' => 'var'
+                      'contents' => [
+                        {
+                          'text' => 'var'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 104
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'dfn',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 104
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'dfn',
                   'contents' => [
                     {
-                      'text' => 'dfn'
+                      'contents' => [
+                        {
+                          'text' => 'dfn'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 104
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'i',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 104
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'i',
                   'contents' => [
                     {
-                      'text' => 'i'
+                      'contents' => [
+                        {
+                          'text' => 'i'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 104
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 104
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -8796,166 +8948,171 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'env',
               'contents' => [
                 {
+                  'cmdname' => 'env',
                   'contents' => [
                     {
-                      'text' => 'env'
+                      'contents' => [
+                        {
+                          'text' => 'env'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 106
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'code',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 106
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'code',
                   'contents' => [
                     {
-                      'text' => 'code'
+                      'contents' => [
+                        {
+                          'text' => 'code'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 106
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'option',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 106
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'option',
                   'contents' => [
                     {
-                      'text' => 'option'
+                      'contents' => [
+                        {
+                          'text' => 'option'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 106
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'samp',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 106
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'samp',
                   'contents' => [
                     {
-                      'text' => 'samp'
+                      'contents' => [
+                        {
+                          'text' => 'samp'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 106
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'command',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 106
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'command',
                   'contents' => [
                     {
-                      'text' => 'command'
+                      'contents' => [
+                        {
+                          'text' => 'command'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 106
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'file',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 106
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'file',
                   'contents' => [
                     {
-                      'text' => 'file'
+                      'contents' => [
+                        {
+                          'text' => 'file'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 106
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'kbd',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 106
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'kbd',
                   'contents' => [
                     {
-                      'text' => 'C-x '
-                    },
-                    {
-                      'cmdname' => 'key',
                       'contents' => [
                         {
+                          'text' => 'C-x '
+                        },
+                        {
+                          'cmdname' => 'key',
                           'contents' => [
                             {
-                              'text' => 'ESC'
+                              'contents' => [
+                                {
+                                  'text' => 'ESC'
+                                }
+                              ],
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'brace_container'
+                          'source_info' => {
+                            'line_nr' => 106
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 106
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 106
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 106
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC'
@@ -8970,167 +9127,170 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'env',
               'contents' => [
                 {
+                  'cmdname' => 'env',
                   'contents' => [
                     {
-                      'text' => 'env'
+                      'contents' => [
+                        {
+                          'text' => 'env'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 107
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'code',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 107
+                  }
+                },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'code'
-                    }
-                  ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 107
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'option',
-              'contents' => [
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'code',
                   'contents' => [
                     {
-                      'text' => 'option'
+                      'contents' => [
+                        {
+                          'text' => 'code'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 107
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'samp',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 107
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'option',
                   'contents' => [
                     {
-                      'text' => 'samp'
+                      'contents' => [
+                        {
+                          'text' => 'option'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 107
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'command',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 107
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'samp',
                   'contents' => [
                     {
-                      'text' => 'command'
+                      'contents' => [
+                        {
+                          'text' => 'samp'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 107
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'file',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 107
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'command',
                   'contents' => [
                     {
-                      'text' => 'file'
+                      'contents' => [
+                        {
+                          'text' => 'command'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 107
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'kbd',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 107
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'file',
                   'contents' => [
                     {
-                      'text' => 'C-x '
-                    },
+                      'contents' => [
+                        {
+                          'text' => 'file'
+                        }
+                      ],
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 107
+                  }
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'kbd',
+                  'contents' => [
                     {
-                      'cmdname' => 'key',
                       'contents' => [
                         {
+                          'text' => 'C-x '
+                        },
+                        {
+                          'cmdname' => 'key',
                           'contents' => [
                             {
-                              'text' => 'ESC'
+                              'contents' => [
+                                {
+                                  'text' => 'ESC'
+                                }
+                              ],
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'brace_container'
+                          'source_info' => {
+                            'line_nr' => 107
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 107
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 107
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 107
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -9150,39 +9310,44 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '8.27'
-            },
-            {
-              'cmdname' => 'dmn',
               'contents' => [
                 {
+                  'text' => '8.27'
+                },
+                {
+                  'cmdname' => 'dmn',
                   'contents' => [
                     {
-                      'text' => 'in'
+                      'contents' => [
+                        {
+                          'text' => 'in'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 109
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 109
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '8_002e27in'
@@ -9197,40 +9362,43 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '8.27'
-            },
-            {
-              'cmdname' => 'dmn',
               'contents' => [
                 {
+                  'text' => '8.27'
+                },
+                {
+                  'cmdname' => 'dmn',
                   'contents' => [
                     {
-                      'text' => 'in'
+                      'contents' => [
+                        {
+                          'text' => 'in'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 110
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 110
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -9250,55 +9418,60 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'sansserif',
               'contents' => [
                 {
+                  'cmdname' => 'sansserif',
                   'contents' => [
                     {
-                      'text' => 'sansserif'
+                      'contents' => [
+                        {
+                          'text' => 'sansserif'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 112
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'slanted',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 112
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'slanted',
                   'contents' => [
                     {
-                      'text' => 'slanted'
+                      'contents' => [
+                        {
+                          'text' => 'slanted'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 112
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 112
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sansserif-slanted'
@@ -9313,56 +9486,59 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'sansserif',
               'contents' => [
                 {
+                  'cmdname' => 'sansserif',
                   'contents' => [
                     {
-                      'text' => 'sansserif'
+                      'contents' => [
+                        {
+                          'text' => 'sansserif'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 113
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'slanted',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 113
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => 'slanted',
                   'contents' => [
                     {
-                      'text' => 'slanted'
+                      'contents' => [
+                        {
+                          'text' => 'slanted'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 113
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 113
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -9382,36 +9558,41 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'indicateurl',
               'contents' => [
                 {
+                  'cmdname' => 'indicateurl',
                   'contents' => [
                     {
-                      'text' => 'indicateurl'
+                      'contents' => [
+                        {
+                          'text' => 'indicateurl'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 115
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 115
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'indicateurl'
@@ -9426,37 +9607,40 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'indicateurl',
               'contents' => [
                 {
+                  'cmdname' => 'indicateurl',
                   'contents' => [
                     {
-                      'text' => 'indicateurl'
+                      'contents' => [
+                        {
+                          'text' => 'indicateurl'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 116
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 116
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -9476,55 +9660,60 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'sub',
               'contents' => [
                 {
+                  'cmdname' => 'sub',
                   'contents' => [
                     {
-                      'text' => 'g'
+                      'contents' => [
+                        {
+                          'text' => 'g'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 118
-              }
-            },
-            {
-              'text' => 'H 3'
-            },
-            {
-              'cmdname' => 'sup',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 118
+                  }
+                },
+                {
+                  'text' => 'H 3'
+                },
                 {
+                  'cmdname' => 'sup',
                   'contents' => [
                     {
-                      'text' => 'rd'
+                      'contents' => [
+                        {
+                          'text' => 'rd'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 118
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 118
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'gH-3rd'
@@ -9539,56 +9728,59 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'sub',
               'contents' => [
                 {
+                  'cmdname' => 'sub',
                   'contents' => [
                     {
-                      'text' => 'g'
+                      'contents' => [
+                        {
+                          'text' => 'g'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 119
-              }
-            },
-            {
-              'text' => 'H 3'
-            },
-            {
-              'cmdname' => 'sup',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 119
+                  }
+                },
+                {
+                  'text' => 'H 3'
+                },
                 {
+                  'cmdname' => 'sup',
                   'contents' => [
                     {
-                      'text' => 'rd'
+                      'contents' => [
+                        {
+                          'text' => 'rd'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 119
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 119
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -9608,98 +9800,103 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'url',
               'contents' => [
                 {
+                  'cmdname' => 'url',
                   'contents' => [
                     {
-                      'text' => 'http://somewhere_aaa'
+                      'contents' => [
+                        {
+                          'text' => 'http://somewhere_aaa'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 121
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'url',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 121
+                  }
+                },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'url'
-                    }
-                  ],
-                  'type' => 'brace_arg'
+                  'text' => ' '
                 },
                 {
+                  'cmdname' => 'url',
                   'contents' => [
                     {
-                      'text' => 'text'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 121
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'uref',
-              'contents' => [
-                {
-                  'contents' => [
+                      'contents' => [
+                        {
+                          'text' => 'url'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
                     {
-                      'text' => '/man.cgi/1/ls'
+                      'contents' => [
+                        {
+                          'text' => 'text'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 121
+                  }
                 },
                 {
-                  'type' => 'brace_arg'
+                  'text' => ' '
                 },
                 {
+                  'cmdname' => 'uref',
                   'contents' => [
                     {
-                      'text' => 'ls'
+                      'contents' => [
+                        {
+                          'text' => '/man.cgi/1/ls'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'ls'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 121
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 121
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
@@ -9714,99 +9911,102 @@ $result_trees{'at_commands_in_refs_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'url',
               'contents' => [
                 {
+                  'cmdname' => 'url',
                   'contents' => [
                     {
-                      'text' => 'http://somewhere_aaa'
+                      'contents' => [
+                        {
+                          'text' => 'http://somewhere_aaa'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 122
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'url',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 122
+                  }
+                },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'url'
-                    }
-                  ],
-                  'type' => 'brace_arg'
+                  'text' => ' '
                 },
                 {
+                  'cmdname' => 'url',
                   'contents' => [
                     {
-                      'text' => 'text'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 122
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'uref',
-              'contents' => [
-                {
-                  'contents' => [
+                      'contents' => [
+                        {
+                          'text' => 'url'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
                     {
-                      'text' => '/man.cgi/1/ls'
+                      'contents' => [
+                        {
+                          'text' => 'text'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 122
+                  }
                 },
                 {
-                  'type' => 'brace_arg'
+                  'text' => ' '
                 },
                 {
+                  'cmdname' => 'uref',
                   'contents' => [
                     {
-                      'text' => 'ls'
+                      'contents' => [
+                        {
+                          'text' => '/man.cgi/1/ls'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'ls'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 122
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 122
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -13243,470 +13443,470 @@ $result_trees{'at_commands_in_refs_utf8'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[13];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[14];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[15];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[16];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[13];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[14];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[15];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[16];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[17]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[17];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[18]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[18];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[19]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[19];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[20]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[20];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[21]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[21];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[22]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[22];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[23]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[23];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[24]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[24];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[25]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[25];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[26]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[1]{'contents'}[26];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[13];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[14];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[15];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[16];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[17]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[17];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[18]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[18];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[19]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[19];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[20]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[20];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[13];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[14];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[15];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'contents'}[1]{'contents'}[16];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[25]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[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'}[27]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'contents'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'contents'}[1]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[17]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[17];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[18]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[18];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[19]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[19];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[20]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[20];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[21]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[21];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[22]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[22];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[23]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[23];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[24]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[24];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[25]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[25];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[26]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[26];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[17]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[17];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[18]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[18];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[19]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[19];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[20]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[20];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'contents'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'contents'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[13];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[14];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[15];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[16];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[13];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[14];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[15];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[16];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[17]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[17];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[18]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[18];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[19]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[19];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[20]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[20];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[21]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[21];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[22]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[22];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[23]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[23];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[24]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[24];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[25]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[25];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[26]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[26];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[13];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[14];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[15];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[16];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[17]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[17];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[18]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[18];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[19]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[19];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[20]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[20];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[12]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[14]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[15]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[15]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[16]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[16]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[16]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[16]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[16]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[17]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[17]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[17]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[17]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[17]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[17]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[18]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[18]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[18]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[18]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[18]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[18]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[19]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[19]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[19]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[19]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[19]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[19]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[20]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[20]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[13];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[14];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[15];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[21]{'contents'}[1]{'contents'}[16];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[22]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[23]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[23]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[23]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[23]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[24]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[24]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[24]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[24]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[24]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[24]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[25]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[25]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[26]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[26]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[26]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[26]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[27]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[27]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[27]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[27]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[27]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[13];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[14];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[15];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[16];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[13];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[14];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[15];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[16];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[17]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[17];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[18]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[18];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[19]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[19];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[20]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[20];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[21]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[21];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[22]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[22];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[23]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[23];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[24]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[24];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[25]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[25];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[26]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[26];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[13];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[14];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[15];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[16];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[17]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[17];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[18]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[18];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[19]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[19];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[20]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[20];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[30]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[34]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[40]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[40]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[13]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[13];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[14]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[14];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[15]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[15];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[16]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[16];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[5]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[6]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[7]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[8]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[9]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[10]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[11]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[12]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[44]{'contents'}[0]{'contents'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[46]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[46]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[46]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[46]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[48]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[48]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[48]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[48]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[48]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[48]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[50]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[50]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[52]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[52]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[52]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[52]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[52]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[52]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[54]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[54]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[54]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[54]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[54]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[54]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[54]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[54]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[54]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[54]{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
 $result_texis{'at_commands_in_refs_utf8'} = '@setfilename 
at_commands_in_refs_utf8.info
 @documentencoding utf-8
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 d9c43c308a..dbb78d8fb8 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
@@ -70,23 +70,28 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -103,24 +108,27 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'accented char in latin1 in refs'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'accented char in latin1 in refs'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -471,23 +479,28 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e4} \x{eb} \x{ef} \x{f6} \x{fc} \x{ff} \x{c4} 
\x{cb} \x{cf} \x{d6} \x{dc}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e4} \x{eb} \x{ef} \x{f6} \x{fc} \x{ff} \x{c4} 
\x{cb} \x{cf} \x{d6} \x{dc}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
@@ -503,24 +516,27 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e4} \x{eb} \x{ef} \x{f6} \x{fc} \x{ff} \x{c4} 
\x{cb} \x{cf} \x{d6} \x{dc}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e4} \x{eb} \x{ef} \x{f6} \x{fc} \x{ff} \x{c4} 
\x{cb} \x{cf} \x{d6} \x{dc}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -541,23 +557,28 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e9}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e9}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_00e9'
@@ -573,24 +594,27 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e9}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e9}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -611,23 +635,28 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e0} \x{e8} \x{f9}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e0} \x{e8} \x{f9}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_00e0-_00e8-_00f9'
@@ -643,24 +672,27 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e0} \x{e8} \x{f9}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e0} \x{e8} \x{f9}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -681,23 +713,28 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e2} \x{ea} \x{ee} \x{f4} \x{fb} \x{c2} \x{ca} 
\x{ce} \x{d4} \x{db}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e2} \x{ea} \x{ee} \x{f4} \x{fb} \x{c2} \x{ca} 
\x{ce} \x{d4} \x{db}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db'
@@ -713,24 +750,27 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e2} \x{ea} \x{ee} \x{f4} \x{fb} \x{c2} \x{ca} 
\x{ce} \x{d4} \x{db}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e2} \x{ea} \x{ee} \x{f4} \x{fb} \x{c2} \x{ca} 
\x{ce} \x{d4} \x{db}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -751,23 +791,28 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e7}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e7}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_00e7'
@@ -783,24 +828,27 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e7}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e7}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1215,22 +1263,22 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[0];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[8]{'contents'}[0]{'contents'}[0];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[11];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'contents'}[8]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'contents'}[8]{'contents'}[0]{'contents'}[0];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[11];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[11];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[11];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[11];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[11];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[11];
 
 $result_texis{'char_latin1_latin1_in_refs'} = '\\input texinfo
 
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 73ce31ec02..d52002c32f 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
@@ -70,23 +70,28 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -103,24 +108,27 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'char latin2 latin2 in refs'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'char latin2 latin2 in refs'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -332,23 +340,28 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{104} \x{105} \x{2db} \x{118} \x{119}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{104} \x{105} \x{2db} \x{118} \x{119}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_0104-_0105-_02db-_0118-_0119'
@@ -364,24 +377,27 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{104} \x{105} \x{2db} \x{118} \x{119}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{104} \x{105} \x{2db} \x{118} \x{119}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -456,9 +472,9 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'char_latin2_latin2_in_refs'}{'contents'}[3];
+$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'char_latin2_latin2_in_refs'}{'contents'}[3];
 
 $result_texis{'char_latin2_latin2_in_refs'} = '\\input texinfo
 
diff --git a/tp/t/results/formats_encodings/char_us_ascii_latin1_in_refs.pl 
b/tp/t/results/formats_encodings/char_us_ascii_latin1_in_refs.pl
index a6fff82a9e..9477cc7d47 100644
--- a/tp/t/results/formats_encodings/char_us_ascii_latin1_in_refs.pl
+++ b/tp/t/results/formats_encodings/char_us_ascii_latin1_in_refs.pl
@@ -70,23 +70,28 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -103,24 +108,27 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'accented char in latin1 in refs'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'accented char in latin1 in refs'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -471,23 +479,28 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e4} \x{eb} \x{ef} \x{f6} \x{fc} \x{ff} \x{c4} 
\x{cb} \x{cf} \x{d6} \x{dc}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e4} \x{eb} \x{ef} \x{f6} \x{fc} \x{ff} \x{c4} 
\x{cb} \x{cf} \x{d6} \x{dc}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
@@ -503,24 +516,27 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e4} \x{eb} \x{ef} \x{f6} \x{fc} \x{ff} \x{c4} 
\x{cb} \x{cf} \x{d6} \x{dc}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e4} \x{eb} \x{ef} \x{f6} \x{fc} \x{ff} \x{c4} 
\x{cb} \x{cf} \x{d6} \x{dc}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -541,23 +557,28 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e9}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e9}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_00e9'
@@ -573,24 +594,27 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e9}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e9}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -611,23 +635,28 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e0} \x{e8} \x{f9}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e0} \x{e8} \x{f9}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_00e0-_00e8-_00f9'
@@ -643,24 +672,27 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e0} \x{e8} \x{f9}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e0} \x{e8} \x{f9}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -681,23 +713,28 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e2} \x{ea} \x{ee} \x{f4} \x{fb} \x{c2} \x{ca} 
\x{ce} \x{d4} \x{db}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e2} \x{ea} \x{ee} \x{f4} \x{fb} \x{c2} \x{ca} 
\x{ce} \x{d4} \x{db}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db'
@@ -713,24 +750,27 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e2} \x{ea} \x{ee} \x{f4} \x{fb} \x{c2} \x{ca} 
\x{ce} \x{d4} \x{db}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e2} \x{ea} \x{ee} \x{f4} \x{fb} \x{c2} \x{ca} 
\x{ce} \x{d4} \x{db}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -751,23 +791,28 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e7}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e7}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_00e7'
@@ -783,24 +828,27 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e7}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e7}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1215,22 +1263,22 @@ $result_trees{'char_us_ascii_latin1_in_refs'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0];
-$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[0];
-$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[8]{'contents'}[0]{'contents'}[0];
-$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[11];
+$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[2]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[2]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[2]{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[2]{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[2]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[2]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0];
+$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'contents'}[8]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'contents'}[8]{'contents'}[0]{'contents'}[0];
 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[11];
 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[11];
 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[11];
 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[11];
 
$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[11];
+$result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[12]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'char_us_ascii_latin1_in_refs'}{'contents'}[11];
 
 $result_texis{'char_us_ascii_latin1_in_refs'} = '\\input texinfo
 
diff --git a/tp/t/results/formats_encodings/char_utf8_latin1_in_refs.pl 
b/tp/t/results/formats_encodings/char_utf8_latin1_in_refs.pl
index c9a9c6cfeb..a97ea3df67 100644
--- a/tp/t/results/formats_encodings/char_utf8_latin1_in_refs.pl
+++ b/tp/t/results/formats_encodings/char_utf8_latin1_in_refs.pl
@@ -70,23 +70,28 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -103,24 +108,27 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'accented char in latin1 in refs'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'accented char in latin1 in refs'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -471,23 +479,28 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e4} \x{eb} \x{ef} \x{f6} \x{fc} \x{ff} \x{c4} 
\x{cb} \x{cf} \x{d6} \x{dc}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e4} \x{eb} \x{ef} \x{f6} \x{fc} \x{ff} \x{c4} 
\x{cb} \x{cf} \x{d6} \x{dc}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
@@ -503,24 +516,27 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e4} \x{eb} \x{ef} \x{f6} \x{fc} \x{ff} \x{c4} 
\x{cb} \x{cf} \x{d6} \x{dc}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e4} \x{eb} \x{ef} \x{f6} \x{fc} \x{ff} \x{c4} 
\x{cb} \x{cf} \x{d6} \x{dc}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -541,23 +557,28 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e9}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e9}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_00e9'
@@ -573,24 +594,27 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e9}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e9}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -611,23 +635,28 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e0} \x{e8} \x{f9}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e0} \x{e8} \x{f9}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_00e0-_00e8-_00f9'
@@ -643,24 +672,27 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e0} \x{e8} \x{f9}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e0} \x{e8} \x{f9}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -681,23 +713,28 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e2} \x{ea} \x{ee} \x{f4} \x{fb} \x{c2} \x{ca} 
\x{ce} \x{d4} \x{db}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e2} \x{ea} \x{ee} \x{f4} \x{fb} \x{c2} \x{ca} 
\x{ce} \x{d4} \x{db}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 
'_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db'
@@ -713,24 +750,27 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e2} \x{ea} \x{ee} \x{f4} \x{fb} \x{c2} \x{ca} 
\x{ce} \x{d4} \x{db}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e2} \x{ea} \x{ee} \x{f4} \x{fb} \x{c2} \x{ca} 
\x{ce} \x{d4} \x{db}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -751,23 +791,28 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e7}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e7}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_00e7'
@@ -783,24 +828,27 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e7}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e7}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1215,22 +1263,22 @@ $result_trees{'char_utf8_latin1_in_refs'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0];
-$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[0];
-$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'contents'}[8]{'contents'}[0]{'contents'}[0];
-$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'char_utf8_latin1_in_refs'}{'contents'}[11];
+$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[2]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[2]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[2]{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[2]{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[2]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[2]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0];
+$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'contents'}[8]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'contents'}[8]{'contents'}[0]{'contents'}[0];
 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'char_utf8_latin1_in_refs'}{'contents'}[11];
 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'char_utf8_latin1_in_refs'}{'contents'}[11];
 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'char_utf8_latin1_in_refs'}{'contents'}[11];
 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'char_utf8_latin1_in_refs'}{'contents'}[11];
 
$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'char_utf8_latin1_in_refs'}{'contents'}[11];
+$result_trees{'char_utf8_latin1_in_refs'}{'contents'}[12]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'char_utf8_latin1_in_refs'}{'contents'}[11];
 
 $result_texis{'char_utf8_latin1_in_refs'} = '\\input texinfo
 
diff --git a/tp/t/results/formats_encodings/dotless_argument_non_ascii.pl 
b/tp/t/results/formats_encodings/dotless_argument_non_ascii.pl
index bd69ab182d..466f8b0d56 100644
--- a/tp/t/results/formats_encodings/dotless_argument_non_ascii.pl
+++ b/tp/t/results/formats_encodings/dotless_argument_non_ascii.pl
@@ -16,23 +16,28 @@ $result_trees{'dotless_argument_non_ascii'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'dotless_argument_non_ascii'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'dotless_argument_non_ascii'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -113,24 +126,27 @@ $result_trees{'dotless_argument_non_ascii'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
diff --git a/tp/t/results/formats_encodings/japanese_shift_jis.pl 
b/tp/t/results/formats_encodings/japanese_shift_jis.pl
index bff0de656c..2561449a5e 100644
--- a/tp/t/results/formats_encodings/japanese_shift_jis.pl
+++ b/tp/t/results/formats_encodings/japanese_shift_jis.pl
@@ -165,23 +165,28 @@ $result_trees{'japanese_shift_jis'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -197,24 +202,27 @@ $result_trees{'japanese_shift_jis'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "GNU LilyPond --- 
\x{5b66}\x{7fd2}\x{30de}\x{30cb}\x{30e5}\x{30a2}\x{30eb}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "GNU LilyPond --- 
\x{5b66}\x{7fd2}\x{30de}\x{30cb}\x{30e5}\x{30a2}\x{30eb}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -562,23 +570,28 @@ $result_trees{'japanese_shift_jis'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Preface'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Preface'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Preface'
@@ -594,24 +607,27 @@ $result_trees{'japanese_shift_jis'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Preface'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Preface'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -651,23 +667,28 @@ $result_trees{'japanese_shift_jis'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Introduction'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Introduction'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Introduction'
@@ -683,24 +704,27 @@ $result_trees{'japanese_shift_jis'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Introduction'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Introduction'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -747,8 +771,8 @@ $result_trees{'japanese_shift_jis'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'japanese_shift_jis'} = '\\input texinfo @c -*- coding: utf-8; 
mode: texinfo; -*-
 @documentencoding shift_jis
diff --git a/tp/t/results/formats_encodings/manual_simple_latin1_with_error.pl 
b/tp/t/results/formats_encodings/manual_simple_latin1_with_error.pl
index 4a51a82cc1..46f54a1146 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
@@ -70,23 +70,28 @@ $result_trees{'manual_simple_latin1_with_error'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -102,24 +107,27 @@ $result_trees{'manual_simple_latin1_with_error'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "Test\x{e9}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "Test\x{e9}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -138,24 +146,27 @@ $result_trees{'manual_simple_latin1_with_error'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e9}sseul\x{e9}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e9}sseul\x{e9}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -177,23 +188,28 @@ $result_trees{'manual_simple_latin1_with_error'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "Chapitr\x{e9}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "Chapitr\x{e9}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Chapitr_00e9'
@@ -209,24 +225,27 @@ $result_trees{'manual_simple_latin1_with_error'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "Chapitr\x{e9}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "Chapitr\x{e9}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 a4b8d17a7d..648c2df73b 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
@@ -31,23 +31,28 @@ $result_trees{'manual_simple_utf8_with_error'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'manual_simple_utf8_with_error'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "Test\x{e9}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "Test\x{e9}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -99,24 +107,27 @@ $result_trees{'manual_simple_utf8_with_error'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e9}sseul\x{e9}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e9}sseul\x{e9}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -138,23 +149,28 @@ $result_trees{'manual_simple_utf8_with_error'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "Chapitr\x{e9}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "Chapitr\x{e9}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Chapitr_00e9'
@@ -170,24 +186,27 @@ $result_trees{'manual_simple_utf8_with_error'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "Chapitr\x{e9}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "Chapitr\x{e9}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/formats_encodings/multiple_include_encodings.pl 
b/tp/t/results/formats_encodings/multiple_include_encodings.pl
index 3a22fcf4db..41fc7abb3d 100644
--- a/tp/t/results/formats_encodings/multiple_include_encodings.pl
+++ b/tp/t/results/formats_encodings/multiple_include_encodings.pl
@@ -321,23 +321,28 @@ $result_trees{'multiple_include_encodings'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -353,24 +358,27 @@ $result_trees{'multiple_include_encodings'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'include files with multiple encodings'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'include files with multiple encodings'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'source_marks' => [
             {
@@ -450,23 +458,28 @@ $result_trees{'multiple_include_encodings'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e4} \x{eb} \x{ef} \x{f6} \x{fc} \x{ff} \x{c4} 
\x{cb} \x{cf} \x{d6} \x{dc}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e4} \x{eb} \x{ef} \x{f6} \x{fc} \x{ff} \x{c4} 
\x{cb} \x{cf} \x{d6} \x{dc}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 
'_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc'
@@ -482,24 +495,27 @@ $result_trees{'multiple_include_encodings'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{e4} \x{eb} \x{ef} \x{f6} \x{fc} \x{ff} \x{c4} 
\x{cb} \x{cf} \x{d6} \x{dc}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{e4} \x{eb} \x{ef} \x{f6} \x{fc} \x{ff} \x{c4} 
\x{cb} \x{cf} \x{d6} \x{dc}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'source_marks' => [
             {
@@ -632,23 +648,28 @@ $result_trees{'multiple_include_encodings'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Preface'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Preface'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Preface'
@@ -664,24 +685,27 @@ $result_trees{'multiple_include_encodings'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Preface'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Preface'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -735,23 +759,28 @@ $result_trees{'multiple_include_encodings'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Introduction'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Introduction'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Introduction'
@@ -767,24 +796,27 @@ $result_trees{'multiple_include_encodings'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Introduction'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Introduction'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -908,23 +940,28 @@ $result_trees{'multiple_include_encodings'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'char latin2 latin2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'char latin2 latin2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -941,24 +978,27 @@ $result_trees{'multiple_include_encodings'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'char latin2 latin2 in refs'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'char latin2 latin2 in refs'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1172,23 +1212,28 @@ $result_trees{'multiple_include_encodings'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{104} \x{105} \x{2db} \x{118} \x{119}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{104} \x{105} \x{2db} \x{118} \x{119}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_0104-_0105-_02db-_0118-_0119'
@@ -1204,24 +1249,27 @@ $result_trees{'multiple_include_encodings'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{104} \x{105} \x{2db} \x{118} \x{119}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{104} \x{105} \x{2db} \x{118} \x{119}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1373,23 +1421,28 @@ $result_trees{'multiple_include_encodings'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Mixed english and chinese EUC-CN'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Mixed english and chinese EUC-CN'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Mixed-english-and-chinese-EUC_002dCN'
@@ -1405,24 +1458,27 @@ $result_trees{'multiple_include_encodings'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Mixed english and chinese EUC-CN'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Mixed english and chinese EUC-CN'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1714,23 +1770,28 @@ $result_trees{'multiple_include_encodings'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Mixed chinese and english utf-8'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Mixed chinese and english utf-8'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Mixed-chinese-and-english-utf_002d8'
@@ -1746,24 +1807,27 @@ $result_trees{'multiple_include_encodings'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Mixed chinese and english utf-8'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Mixed chinese and english utf-8'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1988,9 +2052,9 @@ $result_trees{'multiple_include_encodings'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'multiple_include_encodings'}{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_include_encodings'}{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'multiple_include_encodings'}{'contents'}[10]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_include_encodings'}{'contents'}[10]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_include_encodings'}{'contents'}[12]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'multiple_include_encodings'}{'contents'}[11];
+$result_trees{'multiple_include_encodings'}{'contents'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_include_encodings'}{'contents'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'multiple_include_encodings'}{'contents'}[10]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_include_encodings'}{'contents'}[10]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_include_encodings'}{'contents'}[12]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'multiple_include_encodings'}{'contents'}[11];
 
 $result_texis{'multiple_include_encodings'} = '\\input texinfo.tex
 @documentencoding ISO-8859-1
diff --git a/tp/t/results/formats_encodings/sample_utf8.pl 
b/tp/t/results/formats_encodings/sample_utf8.pl
index 99e56c93e7..811bccb953 100644
--- a/tp/t/results/formats_encodings/sample_utf8.pl
+++ b/tp/t/results/formats_encodings/sample_utf8.pl
@@ -427,23 +427,28 @@ $result_trees{'sample_utf8'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -459,24 +464,27 @@ $result_trees{'sample_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "Texinfo\x{4e2d}\x{6587}\x{793a}\x{4f8b}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "Texinfo\x{4e2d}\x{6587}\x{793a}\x{4f8b}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -762,23 +770,28 @@ $result_trees{'sample_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{7b2c}\x{4e00}\x{7ae0}\x{ff08}First Chapter\x{ff09}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{7b2c}\x{4e00}\x{7ae0}\x{ff08}First 
Chapter\x{ff09}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_7b2c_4e00_7ae0_ff08First-Chapter_ff09'
@@ -794,24 +807,27 @@ $result_trees{'sample_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{7b2c}\x{4e00}\x{7ae0}\x{ff08}First Chapter\x{ff09}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{7b2c}\x{4e00}\x{7ae0}\x{ff08}First 
Chapter\x{ff09}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1138,23 +1154,28 @@ $result_trees{'sample_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "Second Chapter AE \x{104}\x{118} ae \x{105}\x{119}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "Second Chapter AE \x{104}\x{118} ae 
\x{105}\x{119}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Second-Chapter-AE-_0104_0118-ae-_0105_0119'
@@ -1170,24 +1191,27 @@ $result_trees{'sample_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "Chapter 2 AE \x{104}\x{118} ae \x{105}\x{119}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "Chapter 2 AE \x{104}\x{118} ae \x{105}\x{119}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1222,23 +1246,28 @@ $result_trees{'sample_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Index node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Index node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -1255,24 +1284,27 @@ $result_trees{'sample_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1341,13 +1373,13 @@ $result_trees{'sample_utf8'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'sample_utf8'}{'contents'}[3];
-$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'sample_utf8'}{'contents'}[3];
-$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'sample_utf8'}{'contents'}[3];
-$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'sample_utf8'}{'contents'}[3];
+$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'sample_utf8'}{'contents'}[3];
+$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'sample_utf8'}{'contents'}[3];
+$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'sample_utf8'}{'contents'}[3];
+$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'sample_utf8'}{'contents'}[3];
 
 $result_texis{'sample_utf8'} = '\\input texinfo   @c -*-texinfo-*-
 @c %**start of header
diff --git a/tp/t/results/formats_encodings/verb_delimiter_not_ascii.pl 
b/tp/t/results/formats_encodings/verb_delimiter_not_ascii.pl
index 91d9dac90e..76c6d004de 100644
--- a/tp/t/results/formats_encodings/verb_delimiter_not_ascii.pl
+++ b/tp/t/results/formats_encodings/verb_delimiter_not_ascii.pl
@@ -16,23 +16,28 @@ $result_trees{'verb_delimiter_not_ascii'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'verb_delimiter_not_ascii'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'verb_delimiter_not_ascii'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -113,24 +126,27 @@ $result_trees{'verb_delimiter_not_ascii'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
diff --git a/tp/t/results/formats_encodings/weird_accents.pl 
b/tp/t/results/formats_encodings/weird_accents.pl
index 8336abef90..7f6860b66f 100644
--- a/tp/t/results/formats_encodings/weird_accents.pl
+++ b/tp/t/results/formats_encodings/weird_accents.pl
@@ -54,23 +54,28 @@ $result_trees{'weird_accents'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -85,24 +90,27 @@ $result_trees{'weird_accents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -120,23 +128,28 @@ $result_trees{'weird_accents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -151,24 +164,27 @@ $result_trees{'weird_accents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 25dd3afe28..f35df4e725 100644
--- a/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
+++ b/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
@@ -54,23 +54,28 @@ $result_trees{'weird_accents_disable_encoding'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -85,24 +90,27 @@ $result_trees{'weird_accents_disable_encoding'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -120,23 +128,28 @@ $result_trees{'weird_accents_disable_encoding'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -151,24 +164,27 @@ $result_trees{'weird_accents_disable_encoding'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/heading/heading_in_copying.pl 
b/tp/t/results/heading/heading_in_copying.pl
index 579bebc6ac..4721902f07 100644
--- a/tp/t/results/heading/heading_in_copying.pl
+++ b/tp/t/results/heading/heading_in_copying.pl
@@ -216,23 +216,28 @@ $result_trees{'heading_in_copying'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -247,24 +252,27 @@ $result_trees{'heading_in_copying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/html_tests/U_in_index.pl 
b/tp/t/results/html_tests/U_in_index.pl
index 05c5f2486f..17023264ae 100644
--- a/tp/t/results/html_tests/U_in_index.pl
+++ b/tp/t/results/html_tests/U_in_index.pl
@@ -11,23 +11,28 @@ $result_trees{'U_in_index'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'U_in_index'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -77,23 +85,28 @@ $result_trees{'U_in_index'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -109,24 +122,27 @@ $result_trees{'U_in_index'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -351,9 +367,9 @@ $result_trees{'U_in_index'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'U_in_index'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'U_in_index'}{'contents'}[3];
-$result_trees{'U_in_index'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'U_in_index'}{'contents'}[3];
-$result_trees{'U_in_index'}{'contents'}[4]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'U_in_index'}{'contents'}[3];
+$result_trees{'U_in_index'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'U_in_index'}{'contents'}[3];
+$result_trees{'U_in_index'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'U_in_index'}{'contents'}[3];
+$result_trees{'U_in_index'}{'contents'}[4]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'U_in_index'}{'contents'}[3];
 
 $result_texis{'U_in_index'} = '@node Top
 @top top
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 42ea217960..1ce6641cb2 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
@@ -11,23 +11,28 @@ $result_trees{'acronym_in_node_and_section'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'acronym_in_node_and_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -77,23 +85,28 @@ $result_trees{'acronym_in_node_and_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -108,24 +121,27 @@ $result_trees{'acronym_in_node_and_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -145,23 +161,28 @@ $result_trees{'acronym_in_node_and_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec define'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec define'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sec-define'
@@ -176,24 +197,27 @@ $result_trees{'acronym_in_node_and_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'define'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'define'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -256,39 +280,44 @@ $result_trees{'acronym_in_node_and_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec here is '
-            },
-            {
-              'cmdname' => 'acronym',
               'contents' => [
                 {
+                  'text' => 'sec here is '
+                },
+                {
+                  'cmdname' => 'acronym',
                   'contents' => [
                     {
-                      'text' => 'GHJ'
+                      'contents' => [
+                        {
+                          'text' => 'GHJ'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 12
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 12
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sec-here-is-GHJ'
@@ -303,40 +332,43 @@ $result_trees{'acronym_in_node_and_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'here is '
-            },
-            {
-              'cmdname' => 'acronym',
               'contents' => [
                 {
+                  'text' => 'here is '
+                },
+                {
+                  'cmdname' => 'acronym',
                   'contents' => [
                     {
-                      'text' => 'GHJ'
+                      'contents' => [
+                        {
+                          'text' => 'GHJ'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 13
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 13
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/html_tests/anchor_on_vtable_item.pl 
b/tp/t/results/html_tests/anchor_on_vtable_item.pl
index 4ee80b8084..730d5e6b23 100644
--- a/tp/t/results/html_tests/anchor_on_vtable_item.pl
+++ b/tp/t/results/html_tests/anchor_on_vtable_item.pl
@@ -11,23 +11,28 @@ $result_trees{'anchor_on_vtable_item'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'anchor_on_vtable_item'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -77,23 +85,28 @@ $result_trees{'anchor_on_vtable_item'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -108,24 +121,27 @@ $result_trees{'anchor_on_vtable_item'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -452,23 +468,28 @@ $result_trees{'anchor_on_vtable_item'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Idx'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Idx'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -484,24 +505,27 @@ $result_trees{'anchor_on_vtable_item'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Idx'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Idx'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -593,11 +617,11 @@ $result_trees{'anchor_on_vtable_item'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_on_vtable_item'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'anchor_on_vtable_item'}{'contents'}[3];
-$result_trees{'anchor_on_vtable_item'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'anchor_on_vtable_item'}{'contents'}[3];
-$result_trees{'anchor_on_vtable_item'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'anchor_on_vtable_item'}{'contents'}[3];
-$result_trees{'anchor_on_vtable_item'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'anchor_on_vtable_item'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'anchor_on_vtable_item'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_on_vtable_item'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'anchor_on_vtable_item'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'anchor_on_vtable_item'}{'contents'}[3];
+$result_trees{'anchor_on_vtable_item'}{'contents'}[4]{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'anchor_on_vtable_item'}{'contents'}[3];
+$result_trees{'anchor_on_vtable_item'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'anchor_on_vtable_item'}{'contents'}[3];
+$result_trees{'anchor_on_vtable_item'}{'contents'}[4]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'anchor_on_vtable_item'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'anchor_on_vtable_item'}{'contents'}[6]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_on_vtable_item'}{'contents'}[6]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'anchor_on_vtable_item'} = '@node Top
 @top top
diff --git a/tp/t/results/html_tests/automatic_menus.pl 
b/tp/t/results/html_tests/automatic_menus.pl
index 8540e9c65e..198a6c39b6 100644
--- a/tp/t/results/html_tests/automatic_menus.pl
+++ b/tp/t/results/html_tests/automatic_menus.pl
@@ -11,23 +11,28 @@ $result_trees{'automatic_menus'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'automatic_menus'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -77,23 +85,28 @@ $result_trees{'automatic_menus'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'node_description' => {
@@ -138,24 +151,27 @@ $result_trees{'automatic_menus'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {},
         {
           'text' => '
@@ -176,23 +192,28 @@ $result_trees{'automatic_menus'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'node_description' => {
@@ -237,24 +258,27 @@ $result_trees{'automatic_menus'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'A section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'A section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {},
         {
           'text' => '
@@ -275,23 +299,28 @@ $result_trees{'automatic_menus'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec after'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec after'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sec-after'
@@ -306,23 +335,28 @@ $result_trees{'automatic_menus'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sec after'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sec after'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {
         'section_number' => '1.2'
       },
@@ -339,9 +373,9 @@ $result_trees{'automatic_menus'} = {
   'type' => 'document_root'
 };
 
$result_trees{'automatic_menus'}{'contents'}[3]{'extra'}{'node_description'}{'extra'}{'element_node'}
 = $result_trees{'automatic_menus'}{'contents'}[3];
-$result_trees{'automatic_menus'}{'contents'}[4]{'contents'}[0] = 
$result_trees{'automatic_menus'}{'contents'}[3]{'extra'}{'node_description'};
+$result_trees{'automatic_menus'}{'contents'}[4]{'contents'}[1] = 
$result_trees{'automatic_menus'}{'contents'}[3]{'extra'}{'node_description'};
 
$result_trees{'automatic_menus'}{'contents'}[5]{'extra'}{'node_description'}{'extra'}{'element_node'}
 = $result_trees{'automatic_menus'}{'contents'}[5];
-$result_trees{'automatic_menus'}{'contents'}[6]{'contents'}[0] = 
$result_trees{'automatic_menus'}{'contents'}[5]{'extra'}{'node_description'};
+$result_trees{'automatic_menus'}{'contents'}[6]{'contents'}[1] = 
$result_trees{'automatic_menus'}{'contents'}[5]{'extra'}{'node_description'};
 
 $result_texis{'automatic_menus'} = '@node Top
 @top top
diff --git a/tp/t/results/html_tests/base_for_css_info_in_init_test.pl 
b/tp/t/results/html_tests/base_for_css_info_in_init_test.pl
index 1e6af99475..2fa996e7d3 100644
--- a/tp/t/results/html_tests/base_for_css_info_in_init_test.pl
+++ b/tp/t/results/html_tests/base_for_css_info_in_init_test.pl
@@ -16,23 +16,28 @@ $result_trees{'base_for_css_info_in_init_test'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'base_for_css_info_in_init_test'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/html_tests/character_number_leading_toc_stoc.pl 
b/tp/t/results/html_tests/character_number_leading_toc_stoc.pl
index c5bc30ff44..ffcafde59e 100644
--- a/tp/t/results/html_tests/character_number_leading_toc_stoc.pl
+++ b/tp/t/results/html_tests/character_number_leading_toc_stoc.pl
@@ -11,23 +11,28 @@ $result_trees{'character_number_leading_toc_stoc'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'top',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
@@ -39,23 +44,28 @@ $result_trees{'character_number_leading_toc_stoc'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '0'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => '0'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
@@ -69,23 +79,28 @@ $result_trees{'character_number_leading_toc_stoc'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '_'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => '_'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'unnumbered',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
@@ -97,24 +112,27 @@ $result_trees{'character_number_leading_toc_stoc'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '?'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => '?'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/html_tests/check_htmlxref.pl 
b/tp/t/results/html_tests/check_htmlxref.pl
index fde623979e..e7ed38704c 100644
--- a/tp/t/results/html_tests/check_htmlxref.pl
+++ b/tp/t/results/html_tests/check_htmlxref.pl
@@ -18,94 +18,99 @@ $result_trees{'check_htmlxref'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'Top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
-            },
-            {
-              'text' => '../there/no_existing_no_manual_direction'
-            },
-            {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
-              'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'first'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => '('
+              'contents' => [
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => '../there/no_existing_no_manual_direction'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => 'dir'
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'first'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -120,24 +125,27 @@ $result_trees{'check_htmlxref'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -497,48 +505,51 @@ $result_trees{'check_htmlxref'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'first'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '('
-            },
-            {
-              'text' => 'no_existing_no_manual.info'
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'no_existing_no_manual.info'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -559,82 +570,87 @@ $result_trees{'check_htmlxref'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chapter'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '('
-            },
-            {
-              'text' => 'chap_not_existing'
-            },
-            {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
-            },
-            {
-              'text' => 'dir'
-            },
-            {
-              'text' => ')'
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'type' => 'line_arg'
             },
             {
-              'text' => 'node in dir'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'chap_not_existing'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'node_content' => {
+            {
               'contents' => [
-                {}
-              ]
-            },
-            'normalized' => 'node-in-dir'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                },
+                {
+                  'text' => 'node in dir'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'node-in-dir'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -649,24 +665,27 @@ $result_trees{'check_htmlxref'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -734,20 +753,20 @@ $result_trees{'check_htmlxref'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = $result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[1]{'contents'}[1];
-$result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[2]{'contents'}[0];
-$result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = $result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'check_htmlxref'}{'contents'}[3]{'args'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = $result_trees{'check_htmlxref'}{'contents'}[3]{'args'}[1]{'contents'}[1];
-$result_trees{'check_htmlxref'}{'contents'}[4]{'args'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = $result_trees{'check_htmlxref'}{'contents'}[4]{'args'}[1]{'contents'}[1];
-$result_trees{'check_htmlxref'}{'contents'}[4]{'args'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = $result_trees{'check_htmlxref'}{'contents'}[4]{'args'}[2]{'contents'}[1];
-$result_trees{'check_htmlxref'}{'contents'}[4]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'check_htmlxref'}{'contents'}[4]{'args'}[2]{'contents'}[3];
-$result_trees{'check_htmlxref'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'check_htmlxref'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'check_htmlxref'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'check_htmlxref'}{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'check_htmlxref'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'check_htmlxref'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'check_htmlxref'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'check_htmlxref'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'check_htmlxref'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[3];
+$result_trees{'check_htmlxref'}{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'check_htmlxref'}{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref'}{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
 $result_texis{'check_htmlxref'} = '
 @node Top, (../there/no_existing_no_manual_direction), first, (dir)
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 9695d120a0..20004e6f9f 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
@@ -18,94 +18,99 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'Top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
-            },
-            {
-              'text' => '../there/no_existing_no_manual_direction'
-            },
-            {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
-              'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'first'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => '('
+              'contents' => [
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => '../there/no_existing_no_manual_direction'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => 'dir'
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'first'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -120,24 +125,27 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -497,48 +505,51 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'first'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '('
-            },
-            {
-              'text' => 'no_existing_no_manual.info'
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'no_existing_no_manual.info'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -559,82 +570,87 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chapter'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '('
-            },
-            {
-              'text' => 'chap_not_existing'
-            },
-            {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
-            },
-            {
-              'text' => 'dir'
-            },
-            {
-              'text' => ')'
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'type' => 'line_arg'
             },
             {
-              'text' => 'node in dir'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'chap_not_existing'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'node_content' => {
+            {
               'contents' => [
-                {}
-              ]
-            },
-            'normalized' => 'node-in-dir'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                },
+                {
+                  'text' => 'node in dir'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'node-in-dir'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -649,24 +665,27 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -734,20 +753,20 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[1]{'args'}[1]{'extra'}{'manual_content'}{'contents'}[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]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[1]{'args'}[2]{'contents'}[0];
-$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[3]{'args'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[3]{'args'}[1]{'contents'}[1];
-$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[4]{'args'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[4]{'args'}[1]{'contents'}[1];
-$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[4]{'args'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[4]{'args'}[2]{'contents'}[1];
-$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[4]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[4]{'args'}[2]{'contents'}[3];
-$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[3];
+$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
 $result_texis{'check_htmlxref_ignore_ref_top_up'} = '
 @node Top, (../there/no_existing_no_manual_direction), first, (dir)
diff --git a/tp/t/results/html_tests/check_htmlxref_menu.pl 
b/tp/t/results/html_tests/check_htmlxref_menu.pl
index cf2e8106e5..74ed1076a7 100644
--- a/tp/t/results/html_tests/check_htmlxref_menu.pl
+++ b/tp/t/results/html_tests/check_htmlxref_menu.pl
@@ -26,94 +26,99 @@ $result_trees{'check_htmlxref_menu'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'Top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
-            },
-            {
-              'text' => '../there/no_existing_no_manual_direction'
-            },
-            {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
-              'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'first'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => '('
+              'contents' => [
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => '../there/no_existing_no_manual_direction'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => 'dir'
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'first'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -128,24 +133,27 @@ $result_trees{'check_htmlxref_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -505,48 +513,51 @@ $result_trees{'check_htmlxref_menu'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'first'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '('
-            },
-            {
-              'text' => 'no_existing_no_manual.info'
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'no_existing_no_manual.info'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -567,82 +578,87 @@ $result_trees{'check_htmlxref_menu'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chapter'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '('
-            },
-            {
-              'text' => 'chap_not_existing'
-            },
-            {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
-            },
-            {
-              'text' => 'dir'
-            },
-            {
-              'text' => ')'
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'type' => 'line_arg'
             },
             {
-              'text' => 'node in dir'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'chap_not_existing'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'node_content' => {
+            {
               'contents' => [
-                {}
-              ]
-            },
-            'normalized' => 'node-in-dir'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                },
+                {
+                  'text' => 'node in dir'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'node-in-dir'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -657,24 +673,27 @@ $result_trees{'check_htmlxref_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -742,20 +761,20 @@ $result_trees{'check_htmlxref_menu'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'check_htmlxref_menu'}{'contents'}[1]{'args'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[1]{'args'}[1]{'contents'}[1];
-$result_trees{'check_htmlxref_menu'}{'contents'}[1]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[1]{'args'}[2]{'contents'}[0];
-$result_trees{'check_htmlxref_menu'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'check_htmlxref_menu'}{'contents'}[3]{'args'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[3]{'args'}[1]{'contents'}[1];
-$result_trees{'check_htmlxref_menu'}{'contents'}[4]{'args'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[4]{'args'}[1]{'contents'}[1];
-$result_trees{'check_htmlxref_menu'}{'contents'}[4]{'args'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[4]{'args'}[2]{'contents'}[1];
-$result_trees{'check_htmlxref_menu'}{'contents'}[4]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[4]{'args'}[2]{'contents'}[3];
-$result_trees{'check_htmlxref_menu'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'check_htmlxref_menu'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'check_htmlxref_menu'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'check_htmlxref_menu'}{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'check_htmlxref_menu'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'check_htmlxref_menu'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'check_htmlxref_menu'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'check_htmlxref_menu'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'check_htmlxref_menu'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[3];
+$result_trees{'check_htmlxref_menu'}{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'check_htmlxref_menu'}{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
 $result_texis{'check_htmlxref_menu'} = '
 @node Top, (../there/no_existing_no_manual_direction), first, (dir)
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 5e76b0806b..ab2cb2c502 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
@@ -26,94 +26,99 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'Top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
-            },
-            {
-              'text' => '../there/no_existing_no_manual_direction'
-            },
-            {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
-              'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'first'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => '('
+              'contents' => [
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => '../there/no_existing_no_manual_direction'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => 'dir'
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'first'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -128,24 +133,27 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -505,48 +513,51 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'first'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '('
-            },
-            {
-              'text' => 'no_existing_no_manual.info'
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'no_existing_no_manual.info'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -567,82 +578,87 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chapter'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '('
-            },
-            {
-              'text' => 'chap_not_existing'
-            },
-            {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
-            },
-            {
-              'text' => 'dir'
-            },
-            {
-              'text' => ')'
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'type' => 'line_arg'
             },
             {
-              'text' => 'node in dir'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'chap_not_existing'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'node_content' => {
+            {
               'contents' => [
-                {}
-              ]
-            },
-            'normalized' => 'node-in-dir'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                },
+                {
+                  'text' => 'node in dir'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'node-in-dir'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -657,24 +673,27 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -742,20 +761,20 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[1]{'args'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[1]{'args'}[1]{'contents'}[1];
-$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[1]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[1]{'args'}[2]{'contents'}[0];
-$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[3]{'args'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[3]{'args'}[1]{'contents'}[1];
-$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[4]{'args'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[4]{'args'}[1]{'contents'}[1];
-$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[4]{'args'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[4]{'args'}[2]{'contents'}[1];
-$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[4]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[4]{'args'}[2]{'contents'}[3];
-$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[3];
+$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
 $result_texis{'check_htmlxref_no_use_nodes'} = '
 @node Top, (../there/no_existing_no_manual_direction), first, (dir)
diff --git a/tp/t/results/html_tests/command_in_node_redirection.pl 
b/tp/t/results/html_tests/command_in_node_redirection.pl
index 62e7a5272b..42b6a3b1ed 100644
--- a/tp/t/results/html_tests/command_in_node_redirection.pl
+++ b/tp/t/results/html_tests/command_in_node_redirection.pl
@@ -16,23 +16,28 @@ $result_trees{'command_in_node_redirection'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,40 +52,43 @@ $result_trees{'command_in_node_redirection'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 't '
-            },
-            {
-              'cmdname' => 'r',
               'contents' => [
                 {
+                  'text' => 't '
+                },
+                {
+                  'cmdname' => 'r',
                   'contents' => [
                     {
-                      'text' => 'in r'
+                      'contents' => [
+                        {
+                          'text' => 'in r'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 2
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 2
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/html_tests/command_in_node_redirection_multiple.pl 
b/tp/t/results/html_tests/command_in_node_redirection_multiple.pl
index eae2e2eb71..bfd766e508 100644
--- a/tp/t/results/html_tests/command_in_node_redirection_multiple.pl
+++ b/tp/t/results/html_tests/command_in_node_redirection_multiple.pl
@@ -16,23 +16,28 @@ $result_trees{'command_in_node_redirection_multiple'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,40 +52,43 @@ $result_trees{'command_in_node_redirection_multiple'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 't '
-            },
-            {
-              'cmdname' => 'r',
               'contents' => [
                 {
+                  'text' => 't '
+                },
+                {
+                  'cmdname' => 'r',
                   'contents' => [
                     {
-                      'text' => 'in r'
+                      'contents' => [
+                        {
+                          'text' => 'in r'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 2
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 2
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git 
a/tp/t/results/html_tests/command_in_node_redirection_other_command.pl 
b/tp/t/results/html_tests/command_in_node_redirection_other_command.pl
index d3dfa78ed6..c736375228 100644
--- a/tp/t/results/html_tests/command_in_node_redirection_other_command.pl
+++ b/tp/t/results/html_tests/command_in_node_redirection_other_command.pl
@@ -16,23 +16,28 @@ $result_trees{'command_in_node_redirection_other_command'} 
= {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,40 +52,43 @@ $result_trees{'command_in_node_redirection_other_command'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 't '
-            },
-            {
-              'cmdname' => 'r',
               'contents' => [
                 {
+                  'text' => 't '
+                },
+                {
+                  'cmdname' => 'r',
                   'contents' => [
                     {
-                      'text' => 'in r'
+                      'contents' => [
+                        {
+                          'text' => 'in r'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 2
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 2
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git 
a/tp/t/results/html_tests/command_in_node_redirection_same_command.pl 
b/tp/t/results/html_tests/command_in_node_redirection_same_command.pl
index 458759d993..7e7427e342 100644
--- a/tp/t/results/html_tests/command_in_node_redirection_same_command.pl
+++ b/tp/t/results/html_tests/command_in_node_redirection_same_command.pl
@@ -16,23 +16,28 @@ $result_trees{'command_in_node_redirection_same_command'} = 
{
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,40 +52,43 @@ $result_trees{'command_in_node_redirection_same_command'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 't '
-            },
-            {
-              'cmdname' => 'r',
               'contents' => [
                 {
+                  'text' => 't '
+                },
+                {
+                  'cmdname' => 'r',
                   'contents' => [
                     {
-                      'text' => 'in r'
+                      'contents' => [
+                        {
+                          'text' => 'in r'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 2
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 2
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git 
a/tp/t/results/html_tests/command_in_node_redirection_two_commands.pl 
b/tp/t/results/html_tests/command_in_node_redirection_two_commands.pl
index 866f67ba85..f1a696aa9c 100644
--- a/tp/t/results/html_tests/command_in_node_redirection_two_commands.pl
+++ b/tp/t/results/html_tests/command_in_node_redirection_two_commands.pl
@@ -16,23 +16,28 @@ $result_trees{'command_in_node_redirection_two_commands'} = 
{
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,40 +52,43 @@ $result_trees{'command_in_node_redirection_two_commands'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 't '
-            },
-            {
-              'cmdname' => 'r',
               'contents' => [
                 {
+                  'text' => 't '
+                },
+                {
+                  'cmdname' => 'r',
                   'contents' => [
                     {
-                      'text' => 'in r'
+                      'contents' => [
+                        {
+                          'text' => 'in r'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 2
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 2
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/html_tests/contents_at_end.pl 
b/tp/t/results/html_tests/contents_at_end.pl
index f1480130e7..af139e7c77 100644
--- a/tp/t/results/html_tests/contents_at_end.pl
+++ b/tp/t/results/html_tests/contents_at_end.pl
@@ -31,23 +31,28 @@ $result_trees{'contents_at_end'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'contents_at_end'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Contents at end'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Contents at end'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -219,23 +227,28 @@ $result_trees{'contents_at_end'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -251,24 +264,27 @@ $result_trees{'contents_at_end'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -330,7 +346,7 @@ $result_trees{'contents_at_end'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_at_end'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_at_end'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_at_end'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_at_end'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'contents_at_end'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/contents_at_end_inline.pl 
b/tp/t/results/html_tests/contents_at_end_inline.pl
index e41b05e19d..cbdd2f8bc3 100644
--- a/tp/t/results/html_tests/contents_at_end_inline.pl
+++ b/tp/t/results/html_tests/contents_at_end_inline.pl
@@ -31,23 +31,28 @@ $result_trees{'contents_at_end_inline'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'contents_at_end_inline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Contents at end'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Contents at end'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -219,23 +227,28 @@ $result_trees{'contents_at_end_inline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -251,24 +264,27 @@ $result_trees{'contents_at_end_inline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -330,7 +346,7 @@ $result_trees{'contents_at_end_inline'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_at_end_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_at_end_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_at_end_inline'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_at_end_inline'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'contents_at_end_inline'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/contents_at_end_separate_element.pl 
b/tp/t/results/html_tests/contents_at_end_separate_element.pl
index ea1a8e1608..5bf29addb4 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
@@ -31,23 +31,28 @@ $result_trees{'contents_at_end_separate_element'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'contents_at_end_separate_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Contents at end'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Contents at end'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -219,23 +227,28 @@ $result_trees{'contents_at_end_separate_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -251,24 +264,27 @@ $result_trees{'contents_at_end_separate_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -330,7 +346,7 @@ $result_trees{'contents_at_end_separate_element'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_at_end_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_at_end_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_at_end_separate_element'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_at_end_separate_element'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'contents_at_end_separate_element'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/contents_in_middle_chapter.pl 
b/tp/t/results/html_tests/contents_in_middle_chapter.pl
index fadb2c8388..7e9ba8609c 100644
--- a/tp/t/results/html_tests/contents_in_middle_chapter.pl
+++ b/tp/t/results/html_tests/contents_in_middle_chapter.pl
@@ -31,23 +31,28 @@ $result_trees{'contents_in_middle_chapter'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'contents_in_middle_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Contents in chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Contents in chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -219,23 +227,28 @@ $result_trees{'contents_in_middle_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -251,24 +264,27 @@ $result_trees{'contents_in_middle_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -424,23 +440,28 @@ $result_trees{'contents_in_middle_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -456,24 +477,27 @@ $result_trees{'contents_in_middle_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -520,8 +544,8 @@ $result_trees{'contents_in_middle_chapter'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_in_middle_chapter'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_in_middle_chapter'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'contents_in_middle_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_in_middle_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_in_middle_chapter'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_in_middle_chapter'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_in_middle_chapter'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_in_middle_chapter'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'contents_in_middle_chapter'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/contents_in_middle_chapter_inline.pl 
b/tp/t/results/html_tests/contents_in_middle_chapter_inline.pl
index af1b4c6069..da588e4cbb 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
@@ -31,23 +31,28 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Contents in chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Contents in chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -219,23 +227,28 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -251,24 +264,27 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -424,23 +440,28 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -456,24 +477,27 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -520,8 +544,8 @@ $result_trees{'contents_in_middle_chapter_inline'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_in_middle_chapter_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_in_middle_chapter_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'contents_in_middle_chapter_inline'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_in_middle_chapter_inline'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_in_middle_chapter_inline'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_in_middle_chapter_inline'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_in_middle_chapter_inline'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_in_middle_chapter_inline'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'contents_in_middle_chapter_inline'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git 
a/tp/t/results/html_tests/contents_in_middle_chapter_separate_element.pl 
b/tp/t/results/html_tests/contents_in_middle_chapter_separate_element.pl
index 15a7741819..76bacd9055 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
@@ -31,23 +31,28 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Contents in chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Contents in chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -219,23 +227,28 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -251,24 +264,27 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -424,23 +440,28 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -456,24 +477,27 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -520,8 +544,8 @@ 
$result_trees{'contents_in_middle_chapter_separate_element'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_in_middle_chapter_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_in_middle_chapter_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'contents_in_middle_chapter_separate_element'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_in_middle_chapter_separate_element'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_in_middle_chapter_separate_element'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_in_middle_chapter_separate_element'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_in_middle_chapter_separate_element'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_in_middle_chapter_separate_element'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'contents_in_middle_chapter_separate_element'} = '\\input 
texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/contents_in_middle_section.pl 
b/tp/t/results/html_tests/contents_in_middle_section.pl
index 87b6e8fae5..c43801a341 100644
--- a/tp/t/results/html_tests/contents_in_middle_section.pl
+++ b/tp/t/results/html_tests/contents_in_middle_section.pl
@@ -31,23 +31,28 @@ $result_trees{'contents_in_middle_section'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'contents_in_middle_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Contents in section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Contents in section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -219,23 +227,28 @@ $result_trees{'contents_in_middle_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -251,24 +264,27 @@ $result_trees{'contents_in_middle_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -447,23 +463,28 @@ $result_trees{'contents_in_middle_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -479,24 +500,27 @@ $result_trees{'contents_in_middle_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -546,23 +570,28 @@ $result_trees{'contents_in_middle_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section1'
@@ -578,24 +607,27 @@ $result_trees{'contents_in_middle_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -642,9 +674,9 @@ $result_trees{'contents_in_middle_section'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_in_middle_section'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_in_middle_section'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'contents_in_middle_section'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_in_middle_section'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'contents_in_middle_section'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_in_middle_section'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_in_middle_section'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_in_middle_section'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_in_middle_section'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_in_middle_section'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_in_middle_section'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_in_middle_section'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'contents_in_middle_section'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/contents_in_middle_section_inline.pl 
b/tp/t/results/html_tests/contents_in_middle_section_inline.pl
index c0d6b8de6d..2aa40801e8 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
@@ -31,23 +31,28 @@ $result_trees{'contents_in_middle_section_inline'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'contents_in_middle_section_inline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Contents in section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Contents in section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -219,23 +227,28 @@ $result_trees{'contents_in_middle_section_inline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -251,24 +264,27 @@ $result_trees{'contents_in_middle_section_inline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -447,23 +463,28 @@ $result_trees{'contents_in_middle_section_inline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -479,24 +500,27 @@ $result_trees{'contents_in_middle_section_inline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -546,23 +570,28 @@ $result_trees{'contents_in_middle_section_inline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section1'
@@ -578,24 +607,27 @@ $result_trees{'contents_in_middle_section_inline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -642,9 +674,9 @@ $result_trees{'contents_in_middle_section_inline'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_in_middle_section_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_in_middle_section_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'contents_in_middle_section_inline'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[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'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_in_middle_section_inline'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_in_middle_section_inline'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_in_middle_section_inline'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_in_middle_section_inline'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_in_middle_section_inline'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_in_middle_section_inline'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_in_middle_section_inline'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'contents_in_middle_section_inline'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git 
a/tp/t/results/html_tests/contents_in_middle_section_separate_element.pl 
b/tp/t/results/html_tests/contents_in_middle_section_separate_element.pl
index a9c58b577e..8fcc05805b 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
@@ -31,23 +31,28 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Contents in section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Contents in section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -219,23 +227,28 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -251,24 +264,27 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -447,23 +463,28 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -479,24 +500,27 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -546,23 +570,28 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section1'
@@ -578,24 +607,27 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -642,9 +674,9 @@ 
$result_trees{'contents_in_middle_section_separate_element'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[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'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_in_middle_section_separate_element'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'contents_in_middle_section_separate_element'} = '\\input 
texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/contents_with_only_top_node.pl 
b/tp/t/results/html_tests/contents_with_only_top_node.pl
index c6da8d50e1..b833af2b27 100644
--- a/tp/t/results/html_tests/contents_with_only_top_node.pl
+++ b/tp/t/results/html_tests/contents_with_only_top_node.pl
@@ -26,24 +26,27 @@ $result_trees{'contents_with_only_top_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/html_tests/css_in_node_redirection_page.pl 
b/tp/t/results/html_tests/css_in_node_redirection_page.pl
index f7002d1232..e6627bcdb4 100644
--- a/tp/t/results/html_tests/css_in_node_redirection_page.pl
+++ b/tp/t/results/html_tests/css_in_node_redirection_page.pl
@@ -16,23 +16,28 @@ $result_trees{'css_in_node_redirection_page'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'css_in_node_redirection_page'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 69c4d2a3f7..8542eb2686 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
@@ -313,23 +313,28 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -344,24 +349,27 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -379,23 +387,28 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -410,24 +423,27 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -622,7 +638,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[3];
+$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[3];
 
 $result_texis{'deftypefnnewline_for_copying_after'} = '@copying
 @deftypefun TYPE NAME ARGUMENTS...
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 ac302d7c2b..0496a3322b 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
@@ -280,23 +280,28 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -311,24 +316,27 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -346,23 +354,28 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -377,24 +390,27 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -589,7 +605,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[3];
+$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[3];
 
 $result_texis{'deftypefnnewline_for_copying_before'} = '
 @deftypefnnewline on
diff --git a/tp/t/results/html_tests/documentdescription.pl 
b/tp/t/results/html_tests/documentdescription.pl
index de285c9ff7..ecec2bb07b 100644
--- a/tp/t/results/html_tests/documentdescription.pl
+++ b/tp/t/results/html_tests/documentdescription.pl
@@ -230,23 +230,28 @@ $result_trees{'documentdescription'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'top',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
diff --git a/tp/t/results/html_tests/double_contents.pl 
b/tp/t/results/html_tests/double_contents.pl
index e51f1ff8d0..f795aef0df 100644
--- a/tp/t/results/html_tests/double_contents.pl
+++ b/tp/t/results/html_tests/double_contents.pl
@@ -53,23 +53,28 @@ $result_trees{'double_contents'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -85,24 +90,27 @@ $result_trees{'double_contents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Double contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Double contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -241,23 +249,28 @@ $result_trees{'double_contents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -273,24 +286,27 @@ $result_trees{'double_contents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -446,23 +462,28 @@ $result_trees{'double_contents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -478,24 +499,27 @@ $result_trees{'double_contents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section with contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section with contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -543,8 +567,8 @@ $result_trees{'double_contents'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/double_contents_after_title.pl 
b/tp/t/results/html_tests/double_contents_after_title.pl
index 94a92720e1..dd8003b24e 100644
--- a/tp/t/results/html_tests/double_contents_after_title.pl
+++ b/tp/t/results/html_tests/double_contents_after_title.pl
@@ -53,23 +53,28 @@ $result_trees{'double_contents_after_title'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -85,24 +90,27 @@ $result_trees{'double_contents_after_title'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Double contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Double contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -241,23 +249,28 @@ $result_trees{'double_contents_after_title'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -273,24 +286,27 @@ $result_trees{'double_contents_after_title'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -446,23 +462,28 @@ $result_trees{'double_contents_after_title'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -478,24 +499,27 @@ $result_trees{'double_contents_after_title'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section with contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section with contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -543,8 +567,8 @@ $result_trees{'double_contents_after_title'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_after_title'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_after_title'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents_after_title'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_after_title'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_after_title'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_after_title'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_after_title'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_after_title'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents_after_title'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/double_contents_after_title_show_title.pl 
b/tp/t/results/html_tests/double_contents_after_title_show_title.pl
index 4076e90a65..a8bd16d185 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
@@ -53,23 +53,28 @@ $result_trees{'double_contents_after_title_show_title'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -85,24 +90,27 @@ $result_trees{'double_contents_after_title_show_title'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Double contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Double contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -241,23 +249,28 @@ $result_trees{'double_contents_after_title_show_title'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -273,24 +286,27 @@ $result_trees{'double_contents_after_title_show_title'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -446,23 +462,28 @@ $result_trees{'double_contents_after_title_show_title'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -478,24 +499,27 @@ $result_trees{'double_contents_after_title_show_title'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section with contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section with contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -543,8 +567,8 @@ $result_trees{'double_contents_after_title_show_title'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_after_title_show_title'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_after_title_show_title'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents_after_title_show_title'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_after_title_show_title'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_after_title_show_title'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_after_title_show_title'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_after_title_show_title'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_after_title_show_title'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents_after_title_show_title'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git 
a/tp/t/results/html_tests/double_contents_after_title_show_title_nodes.pl 
b/tp/t/results/html_tests/double_contents_after_title_show_title_nodes.pl
index a60a15c13e..44adb8ff48 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
@@ -53,23 +53,28 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -85,24 +90,27 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Double contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Double contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -241,23 +249,28 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -273,24 +286,27 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -446,23 +462,28 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -478,24 +499,27 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section with contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section with contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -543,8 +567,8 @@ 
$result_trees{'double_contents_after_title_show_title_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_after_title_show_title_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_after_title_show_title_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents_after_title_show_title_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_after_title_show_title_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_after_title_show_title_nodes'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_after_title_show_title_nodes'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_after_title_show_title_nodes'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_after_title_show_title_nodes'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents_after_title_show_title_nodes'} = '\\input 
texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/double_contents_book.pl 
b/tp/t/results/html_tests/double_contents_book.pl
index d96d43e6f2..37711dad7f 100644
--- a/tp/t/results/html_tests/double_contents_book.pl
+++ b/tp/t/results/html_tests/double_contents_book.pl
@@ -53,23 +53,28 @@ $result_trees{'double_contents_book'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -85,24 +90,27 @@ $result_trees{'double_contents_book'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Double contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Double contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -241,23 +249,28 @@ $result_trees{'double_contents_book'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -273,24 +286,27 @@ $result_trees{'double_contents_book'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -446,23 +462,28 @@ $result_trees{'double_contents_book'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -478,24 +499,27 @@ $result_trees{'double_contents_book'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section with contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section with contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -543,8 +567,8 @@ $result_trees{'double_contents_book'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_book'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_book'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents_book'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_book'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_book'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_book'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_book'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_book'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents_book'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/double_contents_chapter.pl 
b/tp/t/results/html_tests/double_contents_chapter.pl
index 01cf1e5544..c3ef923cbe 100644
--- a/tp/t/results/html_tests/double_contents_chapter.pl
+++ b/tp/t/results/html_tests/double_contents_chapter.pl
@@ -53,23 +53,28 @@ $result_trees{'double_contents_chapter'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -85,24 +90,27 @@ $result_trees{'double_contents_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Double contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Double contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -241,23 +249,28 @@ $result_trees{'double_contents_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -273,24 +286,27 @@ $result_trees{'double_contents_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -446,23 +462,28 @@ $result_trees{'double_contents_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -478,24 +499,27 @@ $result_trees{'double_contents_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section with contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section with contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -543,8 +567,8 @@ $result_trees{'double_contents_chapter'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_chapter'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_chapter'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_chapter'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_chapter'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_chapter'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_chapter'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents_chapter'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/double_contents_inline.pl 
b/tp/t/results/html_tests/double_contents_inline.pl
index b1355cb804..8c2d78b23c 100644
--- a/tp/t/results/html_tests/double_contents_inline.pl
+++ b/tp/t/results/html_tests/double_contents_inline.pl
@@ -53,23 +53,28 @@ $result_trees{'double_contents_inline'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -85,24 +90,27 @@ $result_trees{'double_contents_inline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Double contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Double contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -241,23 +249,28 @@ $result_trees{'double_contents_inline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -273,24 +286,27 @@ $result_trees{'double_contents_inline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -446,23 +462,28 @@ $result_trees{'double_contents_inline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -478,24 +499,27 @@ $result_trees{'double_contents_inline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section with contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section with contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -543,8 +567,8 @@ $result_trees{'double_contents_inline'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents_inline'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_inline'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_inline'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_inline'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_inline'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_inline'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents_inline'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/double_contents_inline_chapter.pl 
b/tp/t/results/html_tests/double_contents_inline_chapter.pl
index 75c67e29bb..680b0eda85 100644
--- a/tp/t/results/html_tests/double_contents_inline_chapter.pl
+++ b/tp/t/results/html_tests/double_contents_inline_chapter.pl
@@ -53,23 +53,28 @@ $result_trees{'double_contents_inline_chapter'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -85,24 +90,27 @@ $result_trees{'double_contents_inline_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Double contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Double contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -241,23 +249,28 @@ $result_trees{'double_contents_inline_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -273,24 +286,27 @@ $result_trees{'double_contents_inline_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -446,23 +462,28 @@ $result_trees{'double_contents_inline_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -478,24 +499,27 @@ $result_trees{'double_contents_inline_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section with contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section with contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -543,8 +567,8 @@ $result_trees{'double_contents_inline_chapter'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_inline_chapter'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_inline_chapter'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents_inline_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_inline_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_inline_chapter'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_inline_chapter'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_inline_chapter'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_inline_chapter'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents_inline_chapter'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/double_contents_inline_nodes.pl 
b/tp/t/results/html_tests/double_contents_inline_nodes.pl
index 2b8f257f80..cd134eb875 100644
--- a/tp/t/results/html_tests/double_contents_inline_nodes.pl
+++ b/tp/t/results/html_tests/double_contents_inline_nodes.pl
@@ -53,23 +53,28 @@ $result_trees{'double_contents_inline_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -85,24 +90,27 @@ $result_trees{'double_contents_inline_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Double contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Double contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -241,23 +249,28 @@ $result_trees{'double_contents_inline_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -273,24 +286,27 @@ $result_trees{'double_contents_inline_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -446,23 +462,28 @@ $result_trees{'double_contents_inline_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -478,24 +499,27 @@ $result_trees{'double_contents_inline_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section with contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section with contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -543,8 +567,8 @@ $result_trees{'double_contents_inline_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_inline_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_inline_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents_inline_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_inline_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_inline_nodes'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_inline_nodes'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_inline_nodes'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_inline_nodes'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents_inline_nodes'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/double_contents_inline_section.pl 
b/tp/t/results/html_tests/double_contents_inline_section.pl
index 30b109634e..73f2d94f8e 100644
--- a/tp/t/results/html_tests/double_contents_inline_section.pl
+++ b/tp/t/results/html_tests/double_contents_inline_section.pl
@@ -53,23 +53,28 @@ $result_trees{'double_contents_inline_section'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -85,24 +90,27 @@ $result_trees{'double_contents_inline_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Double contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Double contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -241,23 +249,28 @@ $result_trees{'double_contents_inline_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -273,24 +286,27 @@ $result_trees{'double_contents_inline_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -446,23 +462,28 @@ $result_trees{'double_contents_inline_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -478,24 +499,27 @@ $result_trees{'double_contents_inline_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section with contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section with contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -543,8 +567,8 @@ $result_trees{'double_contents_inline_section'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_inline_section'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_inline_section'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents_inline_section'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_inline_section'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_inline_section'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_inline_section'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_inline_section'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_inline_section'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents_inline_section'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/double_contents_nodes.pl 
b/tp/t/results/html_tests/double_contents_nodes.pl
index 9524c504c0..3c9ddb90f9 100644
--- a/tp/t/results/html_tests/double_contents_nodes.pl
+++ b/tp/t/results/html_tests/double_contents_nodes.pl
@@ -53,23 +53,28 @@ $result_trees{'double_contents_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -85,24 +90,27 @@ $result_trees{'double_contents_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Double contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Double contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -241,23 +249,28 @@ $result_trees{'double_contents_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -273,24 +286,27 @@ $result_trees{'double_contents_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -446,23 +462,28 @@ $result_trees{'double_contents_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -478,24 +499,27 @@ $result_trees{'double_contents_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section with contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section with contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -543,8 +567,8 @@ $result_trees{'double_contents_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_nodes'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_nodes'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_nodes'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_nodes'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents_nodes'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/double_contents_section.pl 
b/tp/t/results/html_tests/double_contents_section.pl
index efac57fdf5..989b6c4b6d 100644
--- a/tp/t/results/html_tests/double_contents_section.pl
+++ b/tp/t/results/html_tests/double_contents_section.pl
@@ -53,23 +53,28 @@ $result_trees{'double_contents_section'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -85,24 +90,27 @@ $result_trees{'double_contents_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Double contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Double contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -241,23 +249,28 @@ $result_trees{'double_contents_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -273,24 +286,27 @@ $result_trees{'double_contents_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -446,23 +462,28 @@ $result_trees{'double_contents_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -478,24 +499,27 @@ $result_trees{'double_contents_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section with contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section with contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -543,8 +567,8 @@ $result_trees{'double_contents_section'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_section'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_section'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents_section'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_section'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_section'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_section'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_section'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_section'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents_section'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/double_contents_separate_element.pl 
b/tp/t/results/html_tests/double_contents_separate_element.pl
index 9088d94eac..42df3d587b 100644
--- a/tp/t/results/html_tests/double_contents_separate_element.pl
+++ b/tp/t/results/html_tests/double_contents_separate_element.pl
@@ -53,23 +53,28 @@ $result_trees{'double_contents_separate_element'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -85,24 +90,27 @@ $result_trees{'double_contents_separate_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Double contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Double contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -241,23 +249,28 @@ $result_trees{'double_contents_separate_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -273,24 +286,27 @@ $result_trees{'double_contents_separate_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -446,23 +462,28 @@ $result_trees{'double_contents_separate_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -478,24 +499,27 @@ $result_trees{'double_contents_separate_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section with contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section with contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -543,8 +567,8 @@ $result_trees{'double_contents_separate_element'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents_separate_element'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_separate_element'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_separate_element'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_separate_element'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_separate_element'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_separate_element'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents_separate_element'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git 
a/tp/t/results/html_tests/double_contents_separate_element_chapter.pl 
b/tp/t/results/html_tests/double_contents_separate_element_chapter.pl
index 48eaf7dce2..f1039391d3 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
@@ -53,23 +53,28 @@ $result_trees{'double_contents_separate_element_chapter'} = 
{
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -85,24 +90,27 @@ $result_trees{'double_contents_separate_element_chapter'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Double contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Double contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -241,23 +249,28 @@ $result_trees{'double_contents_separate_element_chapter'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -273,24 +286,27 @@ $result_trees{'double_contents_separate_element_chapter'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -446,23 +462,28 @@ $result_trees{'double_contents_separate_element_chapter'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -478,24 +499,27 @@ $result_trees{'double_contents_separate_element_chapter'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section with contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section with contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -543,8 +567,8 @@ $result_trees{'double_contents_separate_element_chapter'} = 
{
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_separate_element_chapter'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_separate_element_chapter'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents_separate_element_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_separate_element_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_separate_element_chapter'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_separate_element_chapter'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_separate_element_chapter'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_separate_element_chapter'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents_separate_element_chapter'} = '\\input texinfo 
@c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/double_contents_separate_element_nodes.pl 
b/tp/t/results/html_tests/double_contents_separate_element_nodes.pl
index 4498f0e92f..2db1b72676 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
@@ -53,23 +53,28 @@ $result_trees{'double_contents_separate_element_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -85,24 +90,27 @@ $result_trees{'double_contents_separate_element_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Double contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Double contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -241,23 +249,28 @@ $result_trees{'double_contents_separate_element_nodes'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -273,24 +286,27 @@ $result_trees{'double_contents_separate_element_nodes'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -446,23 +462,28 @@ $result_trees{'double_contents_separate_element_nodes'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -478,24 +499,27 @@ $result_trees{'double_contents_separate_element_nodes'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section with contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section with contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -543,8 +567,8 @@ $result_trees{'double_contents_separate_element_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_separate_element_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_separate_element_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents_separate_element_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_separate_element_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_separate_element_nodes'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_separate_element_nodes'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_separate_element_nodes'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_separate_element_nodes'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents_separate_element_nodes'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git 
a/tp/t/results/html_tests/double_contents_separate_element_section.pl 
b/tp/t/results/html_tests/double_contents_separate_element_section.pl
index 8d97325298..74cec135c4 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
@@ -53,23 +53,28 @@ $result_trees{'double_contents_separate_element_section'} = 
{
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -85,24 +90,27 @@ $result_trees{'double_contents_separate_element_section'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Double contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Double contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -241,23 +249,28 @@ $result_trees{'double_contents_separate_element_section'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -273,24 +286,27 @@ $result_trees{'double_contents_separate_element_section'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -446,23 +462,28 @@ $result_trees{'double_contents_separate_element_section'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -478,24 +499,27 @@ $result_trees{'double_contents_separate_element_section'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section with contents'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section with contents'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -543,8 +567,8 @@ $result_trees{'double_contents_separate_element_section'} = 
{
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_contents_separate_element_section'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_separate_element_section'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_contents_separate_element_section'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_separate_element_section'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_separate_element_section'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_separate_element_section'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_contents_separate_element_section'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_contents_separate_element_section'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'double_contents_separate_element_section'} = '\\input texinfo 
@c -*-texinfo-*-
 
diff --git 
a/tp/t/results/html_tests/double_recursive_self_section_reference_node_no_use_node.pl
 
b/tp/t/results/html_tests/double_recursive_self_section_reference_node_no_use_node.pl
index f9b5cf9703..ac2d436564 100644
--- 
a/tp/t/results/html_tests/double_recursive_self_section_reference_node_no_use_node.pl
+++ 
b/tp/t/results/html_tests/double_recursive_self_section_reference_node_no_use_node.pl
@@ -16,23 +16,28 @@ 
$result_trees{'double_recursive_self_section_reference_node_no_use_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'n1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'n1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'n1'
@@ -47,45 +52,48 @@ 
$result_trees{'double_recursive_self_section_reference_node_no_use_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'ref',
               'contents' => [
                 {
+                  'cmdname' => 'ref',
                   'contents' => [
                     {
-                      'text' => 'n2'
+                      'contents' => [
+                        {
+                          'text' => 'n2'
+                        }
+                      ],
+                      'extra' => {
+                        'node_content' => {
+                          'contents' => [
+                            {}
+                          ]
+                        },
+                        'normalized' => 'n2'
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'extra' => {
-                    'node_content' => {
-                      'contents' => [
-                        {}
-                      ]
-                    },
-                    'normalized' => 'n2'
-                  },
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 2
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 2
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -105,23 +113,28 @@ 
$result_trees{'double_recursive_self_section_reference_node_no_use_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'n2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'n2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'n2'
@@ -136,44 +149,49 @@ 
$result_trees{'double_recursive_self_section_reference_node_no_use_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'ref',
               'contents' => [
                 {
+                  'cmdname' => 'ref',
                   'contents' => [
                     {
-                      'text' => 'n1'
+                      'contents' => [
+                        {
+                          'text' => 'n1'
+                        }
+                      ],
+                      'extra' => {
+                        'node_content' => {
+                          'contents' => [
+                            {}
+                          ]
+                        },
+                        'normalized' => 'n1'
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'extra' => {
-                    'node_content' => {
-                      'contents' => [
-                        {}
-                      ]
-                    },
-                    'normalized' => 'n1'
-                  },
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 5
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 5
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '2'
       },
@@ -189,8 +207,8 @@ 
$result_trees{'double_recursive_self_section_reference_node_no_use_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_recursive_self_section_reference_node_no_use_node'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_recursive_self_section_reference_node_no_use_node'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'double_recursive_self_section_reference_node_no_use_node'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_recursive_self_section_reference_node_no_use_node'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'double_recursive_self_section_reference_node_no_use_node'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_recursive_self_section_reference_node_no_use_node'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'double_recursive_self_section_reference_node_no_use_node'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_recursive_self_section_reference_node_no_use_node'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'double_recursive_self_section_reference_node_no_use_node'} = 
'@node n1
 @chapter @ref{n2}
diff --git a/tp/t/results/html_tests/empty_chapter_in_html_title.pl 
b/tp/t/results/html_tests/empty_chapter_in_html_title.pl
index f86f87b13e..b573767a71 100644
--- a/tp/t/results/html_tests/empty_chapter_in_html_title.pl
+++ b/tp/t/results/html_tests/empty_chapter_in_html_title.pl
@@ -16,23 +16,28 @@ $result_trees{'empty_chapter_in_html_title'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'empty_chapter_in_html_title'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'empty_chapter_in_html_title'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -113,18 +126,23 @@ $result_trees{'empty_chapter_in_html_title'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
diff --git 
a/tp/t/results/html_tests/empty_chapter_in_html_title_no_node_no_use_nodes.pl 
b/tp/t/results/html_tests/empty_chapter_in_html_title_no_node_no_use_nodes.pl
index 93cbce8cbd..38557fe3f2 100644
--- 
a/tp/t/results/html_tests/empty_chapter_in_html_title_no_node_no_use_nodes.pl
+++ 
b/tp/t/results/html_tests/empty_chapter_in_html_title_no_node_no_use_nodes.pl
@@ -16,23 +16,28 @@ 
$result_trees{'empty_chapter_in_html_title_no_node_no_use_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ 
$result_trees{'empty_chapter_in_html_title_no_node_no_use_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,18 +90,23 @@ 
$result_trees{'empty_chapter_in_html_title_no_node_no_use_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
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 a4200ecab4..e8df4d7d77 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
@@ -53,23 +53,28 @@ $result_trees{'empty_lines_at_beginning_no_setfilename'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -85,24 +90,27 @@ $result_trees{'empty_lines_at_beginning_no_setfilename'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/html_tests/empty_node_in_html_title_no_sec_name.pl 
b/tp/t/results/html_tests/empty_node_in_html_title_no_sec_name.pl
index 5a105da38c..ec454ce0c6 100644
--- a/tp/t/results/html_tests/empty_node_in_html_title_no_sec_name.pl
+++ b/tp/t/results/html_tests/empty_node_in_html_title_no_sec_name.pl
@@ -16,23 +16,28 @@ $result_trees{'empty_node_in_html_title_no_sec_name'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'empty_node_in_html_title_no_sec_name'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,41 +90,51 @@ $result_trees{'empty_node_in_html_title_no_sec_name'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {},
       'source_info' => {
         'line_nr' => 4
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
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 a6cb9961a7..e71caee7e4 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
@@ -16,23 +16,28 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -113,24 +126,27 @@ $result_trees{'file_name_case_insensitive_conflict_node'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -180,23 +196,28 @@ $result_trees{'file_name_case_insensitive_conflict_node'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Foo'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Foo'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Foo'
@@ -211,24 +232,27 @@ $result_trees{'file_name_case_insensitive_conflict_node'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Foo'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Foo'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -248,23 +272,28 @@ $result_trees{'file_name_case_insensitive_conflict_node'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Bar'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Bar'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Bar'
@@ -279,24 +308,27 @@ $result_trees{'file_name_case_insensitive_conflict_node'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Bar'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Bar'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -316,23 +348,28 @@ $result_trees{'file_name_case_insensitive_conflict_node'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'foo'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'foo'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'foo'
@@ -347,24 +384,27 @@ $result_trees{'file_name_case_insensitive_conflict_node'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'foo'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'foo'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -457,8 +497,8 @@ $result_trees{'file_name_case_insensitive_conflict_node'} = 
{
   ],
   'type' => 'document_root'
 };
-$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[10]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[10]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[10]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node'}{'contents'}[10]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'file_name_case_insensitive_conflict_node'} = '@node Top
 @top top section
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 4e7c36adcb..3d1b05c855 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
@@ -16,23 +16,28 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -113,24 +126,27 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -180,23 +196,28 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Foo'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Foo'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Foo'
@@ -211,24 +232,27 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Foo'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Foo'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -248,23 +272,28 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Bar'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Bar'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Bar'
@@ -279,24 +308,27 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Bar'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Bar'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -316,23 +348,28 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'foo'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'foo'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'foo'
@@ -347,24 +384,27 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'foo'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'foo'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -457,8 +497,8 @@ 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[10]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[10]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[10]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_node_no_redirections'}{'contents'}[10]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'file_name_case_insensitive_conflict_node_no_redirections'} = 
'@node Top
 @top top section
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 df350091c9..9c396318e2 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
@@ -16,23 +16,28 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,24 +90,27 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -475,9 +486,9 @@ 
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
   ],
   'type' => 'document_root'
 };
-$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]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'file_name_case_insensitive_conflict_redirections'} = '@node Top
 @top top section
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 13e94b815b..8118a19bd9 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
@@ -16,23 +16,28 @@ $result_trees{'file_name_conflict_with_Top'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'file_name_conflict_with_Top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'file_name_conflict_with_Top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Chapter'
@@ -113,24 +126,27 @@ $result_trees{'file_name_conflict_with_Top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 95189f34a4..a647177a21 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
@@ -16,23 +16,28 @@ $result_trees{'file_name_conflict_with_section'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'file_name_conflict_with_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'anchor',
           'contents' => [
@@ -107,23 +115,28 @@ $result_trees{'file_name_conflict_with_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
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 a648dc1aae..b1c8e70b02 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
@@ -16,23 +16,28 @@ $result_trees{'file_name_conflict_with_user_defined'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'file_name_conflict_with_user_defined'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'file_name_conflict_with_user_defined'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Chapter-1'
@@ -113,24 +126,27 @@ $result_trees{'file_name_conflict_with_user_defined'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -180,23 +196,28 @@ $result_trees{'file_name_conflict_with_user_defined'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Chapter-2'
@@ -211,23 +232,28 @@ $result_trees{'file_name_conflict_with_user_defined'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '2'
       },
diff --git a/tp/t/results/html_tests/filenameconflictwithnonsplit.pl 
b/tp/t/results/html_tests/filenameconflictwithnonsplit.pl
index 147088d29a..10dc8e2bb8 100644
--- a/tp/t/results/html_tests/filenameconflictwithnonsplit.pl
+++ b/tp/t/results/html_tests/filenameconflictwithnonsplit.pl
@@ -16,23 +16,28 @@ $result_trees{'filenameconflictwithnonsplit'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'filenameconflictwithnonsplit'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/html_tests/filenameconflictwithspecialelement.pl 
b/tp/t/results/html_tests/filenameconflictwithspecialelement.pl
index b332f8efad..dfaf6c51ee 100644
--- a/tp/t/results/html_tests/filenameconflictwithspecialelement.pl
+++ b/tp/t/results/html_tests/filenameconflictwithspecialelement.pl
@@ -16,23 +16,28 @@ $result_trees{'filenameconflictwithspecialelement'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'filenameconflictwithspecialelement'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -118,23 +126,28 @@ $result_trees{'filenameconflictwithspecialelement'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -149,24 +162,27 @@ $result_trees{'filenameconflictwithspecialelement'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/html_tests/float_copying.pl 
b/tp/t/results/html_tests/float_copying.pl
index b93a6e983b..776815c67e 100644
--- a/tp/t/results/html_tests/float_copying.pl
+++ b/tp/t/results/html_tests/float_copying.pl
@@ -569,23 +569,28 @@ $result_trees{'float_copying'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -601,24 +606,27 @@ $result_trees{'float_copying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -889,23 +897,28 @@ $result_trees{'float_copying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Copying and floats'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Copying and floats'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -922,24 +935,27 @@ $result_trees{'float_copying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Copying and floats'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Copying and floats'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1319,13 +1335,13 @@ $result_trees{'float_copying'} = {
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[4]{'extra'}{'float'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'extra'}{'caption'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[4];
-$result_trees{'float_copying'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'float_copying'}{'contents'}[1];
-$result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'float_copying'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'float_copying'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'float_copying'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'float_copying'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'float_copying'}{'contents'}[4]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'float_copying'}{'contents'}[3];
+$result_trees{'float_copying'}{'contents'}[2]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'float_copying'}{'contents'}[1];
+$result_trees{'float_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'float_copying'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'float_copying'}{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'float_copying'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'float_copying'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'float_copying'}{'contents'}[4]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'float_copying'}{'contents'}[3];
 
 $result_texis{'float_copying'} = '\\input texinfo @c -*-texinfo-*-
 
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 ecc594fb1b..66c6307085 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
@@ -50,23 +50,28 @@ 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -81,24 +86,27 @@ 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -150,23 +158,28 @@ 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -181,24 +194,27 @@ 
$result_trees{'footnotestyle_separate_html_text_no_monolithic'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/html_tests/footnotestyle_separate_late.pl 
b/tp/t/results/html_tests/footnotestyle_separate_late.pl
index c05c3a57c0..ee590a02c7 100644
--- a/tp/t/results/html_tests/footnotestyle_separate_late.pl
+++ b/tp/t/results/html_tests/footnotestyle_separate_late.pl
@@ -8,23 +8,28 @@ use utf8;
 $result_trees{'footnotestyle_separate_late'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -49,24 +54,27 @@ $result_trees{'footnotestyle_separate_late'} = [
       },
       {},
       {
-        'args' => [
+        'cmdname' => 'top',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'top'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'top'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'top',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -88,23 +96,28 @@ $result_trees{'footnotestyle_separate_late'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap f'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap f'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap-f'
@@ -121,24 +134,27 @@ $result_trees{'footnotestyle_separate_late'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'chapter',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Chapter f'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Chapter f'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'chapter',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -198,23 +214,28 @@ $result_trees{'footnotestyle_separate_late'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap s'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap s'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap-s'
@@ -231,24 +252,27 @@ $result_trees{'footnotestyle_separate_late'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'chapter',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Chapter s'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Chapter s'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'chapter',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
diff --git a/tp/t/results/html_tests/headings_after_lone_nodes.pl 
b/tp/t/results/html_tests/headings_after_lone_nodes.pl
index dba8edb018..4bbd72067e 100644
--- a/tp/t/results/html_tests/headings_after_lone_nodes.pl
+++ b/tp/t/results/html_tests/headings_after_lone_nodes.pl
@@ -11,23 +11,28 @@ $result_trees{'headings_after_lone_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'headings_after_lone_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -77,23 +85,28 @@ $result_trees{'headings_after_lone_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -108,24 +121,27 @@ $result_trees{'headings_after_lone_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -145,24 +161,27 @@ $result_trees{'headings_after_lone_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Qt'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Qt'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -225,24 +244,27 @@ $result_trees{'headings_after_lone_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Other'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Other'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -631,24 +653,27 @@ $result_trees{'headings_after_lone_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Not associated'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Not associated'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -716,24 +741,27 @@ $result_trees{'headings_after_lone_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '2 not'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => '2 not'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -853,24 +881,27 @@ $result_trees{'headings_after_lone_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '3 not'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => '3 not'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -990,24 +1021,27 @@ $result_trees{'headings_after_lone_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '4 not'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => '4 not'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1098,24 +1132,27 @@ $result_trees{'headings_after_lone_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '5 not'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => '5 not'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1272,24 +1309,27 @@ $result_trees{'headings_after_lone_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subnode'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subnode'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1312,9 +1352,9 @@ $result_trees{'headings_after_lone_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'headings_after_lone_nodes'}{'contents'}[6]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'headings_after_lone_nodes'}{'contents'}[6];
-$result_trees{'headings_after_lone_nodes'}{'contents'}[6]{'extra'}{'node_description'}
 = $result_trees{'headings_after_lone_nodes'}{'contents'}[6]{'contents'}[4];
-$result_trees{'headings_after_lone_nodes'}{'contents'}[11]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'headings_after_lone_nodes'}{'contents'}[11]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'headings_after_lone_nodes'}{'contents'}[6]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'headings_after_lone_nodes'}{'contents'}[6];
+$result_trees{'headings_after_lone_nodes'}{'contents'}[6]{'extra'}{'node_description'}
 = $result_trees{'headings_after_lone_nodes'}{'contents'}[6]{'contents'}[5];
+$result_trees{'headings_after_lone_nodes'}{'contents'}[11]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'headings_after_lone_nodes'}{'contents'}[11]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'headings_after_lone_nodes'} = '@node Top
 @top top
diff --git a/tp/t/results/html_tests/html_in_copying.pl 
b/tp/t/results/html_tests/html_in_copying.pl
index 7e9c7f1612..cbe491776a 100644
--- a/tp/t/results/html_tests/html_in_copying.pl
+++ b/tp/t/results/html_tests/html_in_copying.pl
@@ -150,23 +150,28 @@ $result_trees{'html_in_copying'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -181,24 +186,27 @@ $result_trees{'html_in_copying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 a1ba255a74..1a1024c7a7 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
@@ -11,23 +11,28 @@ $result_trees{'index_and_node_same_name'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'top',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
@@ -39,24 +44,27 @@ $result_trees{'index_and_node_same_name'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'index node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'index node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -153,7 +161,7 @@ $result_trees{'index_and_node_same_name'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_and_node_same_name'}{'contents'}[2];
 
 $result_texis{'index_and_node_same_name'} = '@top top
 @node index node
diff --git a/tp/t/results/html_tests/index_below.pl 
b/tp/t/results/html_tests/index_below.pl
index a652770b30..ef2d57181d 100644
--- a/tp/t/results/html_tests/index_below.pl
+++ b/tp/t/results/html_tests/index_below.pl
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'index_below'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -52,24 +55,27 @@ $result_trees{'index_below'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -95,24 +101,27 @@ $result_trees{'index_below'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/html_tests/info_js_dir_html.pl 
b/tp/t/results/html_tests/info_js_dir_html.pl
index 9ff8c5932e..af30d05054 100644
--- a/tp/t/results/html_tests/info_js_dir_html.pl
+++ b/tp/t/results/html_tests/info_js_dir_html.pl
@@ -11,23 +11,28 @@ $result_trees{'info_js_dir_html'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'info_js_dir_html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -77,23 +85,28 @@ $result_trees{'info_js_dir_html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -108,23 +121,28 @@ $result_trees{'info_js_dir_html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
diff --git a/tp/t/results/html_tests/info_js_dir_html_file.pl 
b/tp/t/results/html_tests/info_js_dir_html_file.pl
index 8878a04da5..3a55986e44 100644
--- a/tp/t/results/html_tests/info_js_dir_html_file.pl
+++ b/tp/t/results/html_tests/info_js_dir_html_file.pl
@@ -16,23 +16,28 @@ $result_trees{'info_js_dir_html_file'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'info_js_dir_html_file'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'info_js_dir_html_file'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -113,23 +126,28 @@ $result_trees{'info_js_dir_html_file'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
diff --git 
a/tp/t/results/html_tests/info_js_dir_html_file_js_weblabels_file_undef.pl 
b/tp/t/results/html_tests/info_js_dir_html_file_js_weblabels_file_undef.pl
index b852f095d5..396d294778 100644
--- a/tp/t/results/html_tests/info_js_dir_html_file_js_weblabels_file_undef.pl
+++ b/tp/t/results/html_tests/info_js_dir_html_file_js_weblabels_file_undef.pl
@@ -16,23 +16,28 @@ 
$result_trees{'info_js_dir_html_file_js_weblabels_file_undef'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ 
$result_trees{'info_js_dir_html_file_js_weblabels_file_undef'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ 
$result_trees{'info_js_dir_html_file_js_weblabels_file_undef'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -113,23 +126,28 @@ 
$result_trees{'info_js_dir_html_file_js_weblabels_file_undef'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
diff --git a/tp/t/results/html_tests/info_js_dir_html_text.pl 
b/tp/t/results/html_tests/info_js_dir_html_text.pl
index d4381d8325..2ec0b770a5 100644
--- a/tp/t/results/html_tests/info_js_dir_html_text.pl
+++ b/tp/t/results/html_tests/info_js_dir_html_text.pl
@@ -11,23 +11,28 @@ $result_trees{'info_js_dir_html_text'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'info_js_dir_html_text'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -77,23 +85,28 @@ $result_trees{'info_js_dir_html_text'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -108,23 +121,28 @@ $result_trees{'info_js_dir_html_text'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
diff --git a/tp/t/results/html_tests/inline_in_node.pl 
b/tp/t/results/html_tests/inline_in_node.pl
index 2bf591e731..0bc0a633d6 100644
--- a/tp/t/results/html_tests/inline_in_node.pl
+++ b/tp/t/results/html_tests/inline_in_node.pl
@@ -106,23 +106,28 @@ $result_trees{'inline_in_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -137,19 +142,22 @@ $result_trees{'inline_in_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -162,79 +170,84 @@ $result_trees{'inline_in_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'inlineraw',
               'contents' => [
                 {
+                  'cmdname' => 'inlineraw',
                   'contents' => [
                     {
-                      'text' => 'html'
-                    }
-                  ],
-                  'type' => 'brace_arg'
-                },
-                {
-                  'contents' => [
+                      'contents' => [
+                        {
+                          'text' => 'html'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
                     {
-                      'text' => '<code class="tnode">'
+                      'contents' => [
+                        {
+                          'text' => '<code class="tnode">'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
-                }
-              ],
-              'extra' => {
-                'expand_index' => 1,
-                'format' => 'html'
-              },
-              'source_info' => {
-                'line_nr' => 6
-              }
-            },
-            {
-              'text' => 'One'
-            },
-            {
-              'cmdname' => 'inlineraw',
-              'contents' => [
+                  'extra' => {
+                    'expand_index' => 1,
+                    'format' => 'html'
+                  },
+                  'source_info' => {
+                    'line_nr' => 6
+                  }
+                },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'html'
-                    }
-                  ],
-                  'type' => 'brace_arg'
+                  'text' => 'One'
                 },
                 {
+                  'cmdname' => 'inlineraw',
                   'contents' => [
                     {
-                      'text' => '</code>'
+                      'contents' => [
+                        {
+                          'text' => 'html'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => '</code>'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'extra' => {
+                    'expand_index' => 1,
+                    'format' => 'html'
+                  },
+                  'source_info' => {
+                    'line_nr' => 6
+                  }
                 }
               ],
-              'extra' => {
-                'expand_index' => 1,
-                'format' => 'html'
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
               },
-              'source_info' => {
-                'line_nr' => 6
-              }
+              'type' => 'line_arg'
             }
           ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'htmlOnehtml'
@@ -249,80 +262,83 @@ $result_trees{'inline_in_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'inlineraw',
               'contents' => [
                 {
+                  'cmdname' => 'inlineraw',
                   'contents' => [
                     {
-                      'text' => 'html'
-                    }
-                  ],
-                  'type' => 'brace_arg'
-                },
-                {
-                  'contents' => [
+                      'contents' => [
+                        {
+                          'text' => 'html'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
                     {
-                      'text' => '<span class="test">'
+                      'contents' => [
+                        {
+                          'text' => '<span class="test">'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
-                }
-              ],
-              'extra' => {
-                'expand_index' => 1,
-                'format' => 'html'
-              },
-              'source_info' => {
-                'line_nr' => 7
-              }
-            },
-            {
-              'text' => 'One'
-            },
-            {
-              'cmdname' => 'inlineraw',
-              'contents' => [
+                  'extra' => {
+                    'expand_index' => 1,
+                    'format' => 'html'
+                  },
+                  'source_info' => {
+                    'line_nr' => 7
+                  }
+                },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'html'
-                    }
-                  ],
-                  'type' => 'brace_arg'
+                  'text' => 'One'
                 },
                 {
+                  'cmdname' => 'inlineraw',
                   'contents' => [
                     {
-                      'text' => '</span>'
+                      'contents' => [
+                        {
+                          'text' => 'html'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => '</span>'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'extra' => {
+                    'expand_index' => 1,
+                    'format' => 'html'
+                  },
+                  'source_info' => {
+                    'line_nr' => 7
+                  }
                 }
               ],
-              'extra' => {
-                'expand_index' => 1,
-                'format' => 'html'
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
               },
-              'source_info' => {
-                'line_nr' => 7
-              }
+              'type' => 'line_arg'
             }
           ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/html_tests/letter_command_in_index.pl 
b/tp/t/results/html_tests/letter_command_in_index.pl
index 82b913be03..a19e005440 100644
--- a/tp/t/results/html_tests/letter_command_in_index.pl
+++ b/tp/t/results/html_tests/letter_command_in_index.pl
@@ -11,23 +11,28 @@ $result_trees{'letter_command_in_index'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'letter_command_in_index'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -77,23 +85,28 @@ $result_trees{'letter_command_in_index'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -109,24 +122,27 @@ $result_trees{'letter_command_in_index'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -332,9 +348,9 @@ $result_trees{'letter_command_in_index'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'letter_command_in_index'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'letter_command_in_index'}{'contents'}[3];
-$result_trees{'letter_command_in_index'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'letter_command_in_index'}{'contents'}[3];
-$result_trees{'letter_command_in_index'}{'contents'}[4]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'letter_command_in_index'}{'contents'}[3];
+$result_trees{'letter_command_in_index'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'letter_command_in_index'}{'contents'}[3];
+$result_trees{'letter_command_in_index'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'letter_command_in_index'}{'contents'}[3];
+$result_trees{'letter_command_in_index'}{'contents'}[4]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'letter_command_in_index'}{'contents'}[3];
 
 $result_texis{'letter_command_in_index'} = '@node Top
 @top top
diff --git a/tp/t/results/html_tests/menu.pl b/tp/t/results/html_tests/menu.pl
index 2a0b68adff..79e032ec4c 100644
--- a/tp/t/results/html_tests/menu.pl
+++ b/tp/t/results/html_tests/menu.pl
@@ -18,23 +18,28 @@ $result_trees{'menu'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -49,19 +54,22 @@ $result_trees{'menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1555,20 +1563,20 @@ $result_trees{'menu'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1];
-$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1];
-$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[1];
-$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[2]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[3]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[3]{'contents'}[1]{'contents'}[1];
-$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[5]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[5]{'contents'}[1]{'contents'}[1];
-$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'menu'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'menu'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'menu'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'menu'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'menu'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'menu'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'menu'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'menu'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'menu'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'menu'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[2]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'menu'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'menu'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[3]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[3]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[5]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[5]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[6]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[6]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'menu'} = '
 @node Top
diff --git a/tp/t/results/html_tests/menu_in_documentdescription.pl 
b/tp/t/results/html_tests/menu_in_documentdescription.pl
index fb2f727530..6cbd21cf83 100644
--- a/tp/t/results/html_tests/menu_in_documentdescription.pl
+++ b/tp/t/results/html_tests/menu_in_documentdescription.pl
@@ -11,23 +11,28 @@ $result_trees{'menu_in_documentdescription'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'menu_in_documentdescription'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -243,8 +251,8 @@ $result_trees{'menu_in_documentdescription'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'menu_in_documentdescription'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu_in_documentdescription'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'menu_in_documentdescription'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'menu_in_documentdescription'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'menu_in_documentdescription'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu_in_documentdescription'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu_in_documentdescription'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'menu_in_documentdescription'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
 
 $result_texis{'menu_in_documentdescription'} = '@node Top
 @top top
diff --git a/tp/t/results/html_tests/menu_in_example.pl 
b/tp/t/results/html_tests/menu_in_example.pl
index 6b963fe778..f260a63b81 100644
--- a/tp/t/results/html_tests/menu_in_example.pl
+++ b/tp/t/results/html_tests/menu_in_example.pl
@@ -11,24 +11,27 @@ $result_trees{'menu_in_example'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -491,11 +494,11 @@ $result_trees{'menu_in_example'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1];
-$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4];
-$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'contents'}[1];
-$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'contents'}[4];
+$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4];
+$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'contents'}[1];
+$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'contents'}[4];
 
 $result_texis{'menu_in_example'} = '@node Top
 
diff --git a/tp/t/results/html_tests/no_content.pl 
b/tp/t/results/html_tests/no_content.pl
index b4382f4c80..50a3662a90 100644
--- a/tp/t/results/html_tests/no_content.pl
+++ b/tp/t/results/html_tests/no_content.pl
@@ -31,23 +31,28 @@ $result_trees{'no_content'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'no_content'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'No ccontent'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'No ccontent'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -219,23 +227,28 @@ $result_trees{'no_content'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -251,24 +264,27 @@ $result_trees{'no_content'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -315,7 +331,7 @@ $result_trees{'no_content'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'no_content'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'no_content'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'no_content'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'no_content'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'no_content'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/no_content_do_contents.pl 
b/tp/t/results/html_tests/no_content_do_contents.pl
index dab102d19c..24bfafc172 100644
--- a/tp/t/results/html_tests/no_content_do_contents.pl
+++ b/tp/t/results/html_tests/no_content_do_contents.pl
@@ -31,23 +31,28 @@ $result_trees{'no_content_do_contents'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'no_content_do_contents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'No ccontent'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'No ccontent'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -219,23 +227,28 @@ $result_trees{'no_content_do_contents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -251,24 +264,27 @@ $result_trees{'no_content_do_contents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -315,7 +331,7 @@ $result_trees{'no_content_do_contents'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'no_content_do_contents'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'no_content_do_contents'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'no_content_do_contents'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'no_content_do_contents'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'no_content_do_contents'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/no_content_do_contents_inline.pl 
b/tp/t/results/html_tests/no_content_do_contents_inline.pl
index f78f11f7a4..e29ccc46b3 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
@@ -31,23 +31,28 @@ $result_trees{'no_content_do_contents_inline'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'no_content_do_contents_inline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'No ccontent'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'No ccontent'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -219,23 +227,28 @@ $result_trees{'no_content_do_contents_inline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -251,24 +264,27 @@ $result_trees{'no_content_do_contents_inline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -315,7 +331,7 @@ $result_trees{'no_content_do_contents_inline'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'no_content_do_contents_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'no_content_do_contents_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'no_content_do_contents_inline'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'no_content_do_contents_inline'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'no_content_do_contents_inline'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/no_content_do_contents_separate_element.pl 
b/tp/t/results/html_tests/no_content_do_contents_separate_element.pl
index 9b18950849..d5642b3e91 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
@@ -31,23 +31,28 @@ $result_trees{'no_content_do_contents_separate_element'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'no_content_do_contents_separate_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'No ccontent'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'No ccontent'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -219,23 +227,28 @@ $result_trees{'no_content_do_contents_separate_element'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -251,24 +264,27 @@ $result_trees{'no_content_do_contents_separate_element'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -315,7 +331,7 @@ $result_trees{'no_content_do_contents_separate_element'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'no_content_do_contents_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'no_content_do_contents_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'no_content_do_contents_separate_element'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'no_content_do_contents_separate_element'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'no_content_do_contents_separate_element'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/no_content_inline.pl 
b/tp/t/results/html_tests/no_content_inline.pl
index 3b43d1052a..beb1461d29 100644
--- a/tp/t/results/html_tests/no_content_inline.pl
+++ b/tp/t/results/html_tests/no_content_inline.pl
@@ -31,23 +31,28 @@ $result_trees{'no_content_inline'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'no_content_inline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'No ccontent'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'No ccontent'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -219,23 +227,28 @@ $result_trees{'no_content_inline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -251,24 +264,27 @@ $result_trees{'no_content_inline'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -315,7 +331,7 @@ $result_trees{'no_content_inline'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'no_content_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'no_content_inline'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'no_content_inline'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'no_content_inline'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'no_content_inline'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/no_content_separate_element.pl 
b/tp/t/results/html_tests/no_content_separate_element.pl
index 5ab30afe53..3928d114ef 100644
--- a/tp/t/results/html_tests/no_content_separate_element.pl
+++ b/tp/t/results/html_tests/no_content_separate_element.pl
@@ -31,23 +31,28 @@ $result_trees{'no_content_separate_element'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'no_content_separate_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'No ccontent'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'No ccontent'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -219,23 +227,28 @@ $result_trees{'no_content_separate_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -251,24 +264,27 @@ $result_trees{'no_content_separate_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -315,7 +331,7 @@ $result_trees{'no_content_separate_element'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'no_content_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'no_content_separate_element'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'no_content_separate_element'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'no_content_separate_element'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'no_content_separate_element'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/node_footnote_end.pl 
b/tp/t/results/html_tests/node_footnote_end.pl
index dc075f79ec..58e4d004c3 100644
--- a/tp/t/results/html_tests/node_footnote_end.pl
+++ b/tp/t/results/html_tests/node_footnote_end.pl
@@ -48,24 +48,27 @@ $result_trees{'node_footnote_end'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -376,38 +379,41 @@ $result_trees{'node_footnote_end'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => '\'',
               'contents' => [
                 {
+                  'cmdname' => '\'',
                   'contents' => [
                     {
-                      'text' => 'a'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'following_arg'
                     }
                   ],
-                  'type' => 'following_arg'
+                  'source_info' => {
+                    'file_name' => 'node_footnote.texi',
+                    'line_nr' => 14
+                  }
                 }
               ],
-              'source_info' => {
-                'file_name' => 'node_footnote.texi',
-                'line_nr' => 14
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -510,38 +516,41 @@ $result_trees{'node_footnote_end'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => '^',
               'contents' => [
                 {
+                  'cmdname' => '^',
                   'contents' => [
                     {
-                      'text' => 'a'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'following_arg'
                     }
                   ],
-                  'type' => 'following_arg'
+                  'source_info' => {
+                    'file_name' => 'node_footnote.texi',
+                    'line_nr' => 19
+                  }
                 }
               ],
-              'source_info' => {
-                'file_name' => 'node_footnote.texi',
-                'line_nr' => 19
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -644,23 +653,28 @@ $result_trees{'node_footnote_end'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -676,24 +690,27 @@ $result_trees{'node_footnote_end'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -834,38 +851,41 @@ $result_trees{'node_footnote_end'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => '`',
               'contents' => [
                 {
+                  'cmdname' => '`',
                   'contents' => [
                     {
-                      'text' => 'a'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'following_arg'
                     }
                   ],
-                  'type' => 'following_arg'
+                  'source_info' => {
+                    'file_name' => 'node_footnote.texi',
+                    'line_nr' => 31
+                  }
                 }
               ],
-              'source_info' => {
-                'file_name' => 'node_footnote.texi',
-                'line_nr' => 31
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -980,11 +1000,11 @@ $result_trees{'node_footnote_end'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_footnote_end'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_end'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_end'}{'contents'}[5]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_end'}{'contents'}[5]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'node_footnote_end'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/node_footnote_separated.pl 
b/tp/t/results/html_tests/node_footnote_separated.pl
index 138b40f8f2..3c127e72c2 100644
--- a/tp/t/results/html_tests/node_footnote_separated.pl
+++ b/tp/t/results/html_tests/node_footnote_separated.pl
@@ -48,24 +48,27 @@ $result_trees{'node_footnote_separated'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -376,38 +379,41 @@ $result_trees{'node_footnote_separated'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => '\'',
               'contents' => [
                 {
+                  'cmdname' => '\'',
                   'contents' => [
                     {
-                      'text' => 'a'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'following_arg'
                     }
                   ],
-                  'type' => 'following_arg'
+                  'source_info' => {
+                    'file_name' => 'node_footnote.texi',
+                    'line_nr' => 14
+                  }
                 }
               ],
-              'source_info' => {
-                'file_name' => 'node_footnote.texi',
-                'line_nr' => 14
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -510,38 +516,41 @@ $result_trees{'node_footnote_separated'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => '^',
               'contents' => [
                 {
+                  'cmdname' => '^',
                   'contents' => [
                     {
-                      'text' => 'a'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'following_arg'
                     }
                   ],
-                  'type' => 'following_arg'
+                  'source_info' => {
+                    'file_name' => 'node_footnote.texi',
+                    'line_nr' => 19
+                  }
                 }
               ],
-              'source_info' => {
-                'file_name' => 'node_footnote.texi',
-                'line_nr' => 19
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -644,23 +653,28 @@ $result_trees{'node_footnote_separated'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -676,24 +690,27 @@ $result_trees{'node_footnote_separated'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -834,38 +851,41 @@ $result_trees{'node_footnote_separated'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => '`',
               'contents' => [
                 {
+                  'cmdname' => '`',
                   'contents' => [
                     {
-                      'text' => 'a'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'following_arg'
                     }
                   ],
-                  'type' => 'following_arg'
+                  'source_info' => {
+                    'file_name' => 'node_footnote.texi',
+                    'line_nr' => 31
+                  }
                 }
               ],
-              'source_info' => {
-                'file_name' => 'node_footnote.texi',
-                'line_nr' => 31
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -980,11 +1000,11 @@ $result_trees{'node_footnote_separated'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_footnote_separated'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_separated'}{'contents'}[5]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[5]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'node_footnote_separated'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/node_footnote_use_node.pl 
b/tp/t/results/html_tests/node_footnote_use_node.pl
index f9529733e7..295110e3c6 100644
--- a/tp/t/results/html_tests/node_footnote_use_node.pl
+++ b/tp/t/results/html_tests/node_footnote_use_node.pl
@@ -48,24 +48,27 @@ $result_trees{'node_footnote_use_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -376,38 +379,41 @@ $result_trees{'node_footnote_use_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => '\'',
               'contents' => [
                 {
+                  'cmdname' => '\'',
                   'contents' => [
                     {
-                      'text' => 'a'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'following_arg'
                     }
                   ],
-                  'type' => 'following_arg'
+                  'source_info' => {
+                    'file_name' => 'node_footnote.texi',
+                    'line_nr' => 14
+                  }
                 }
               ],
-              'source_info' => {
-                'file_name' => 'node_footnote.texi',
-                'line_nr' => 14
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -510,38 +516,41 @@ $result_trees{'node_footnote_use_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => '^',
               'contents' => [
                 {
+                  'cmdname' => '^',
                   'contents' => [
                     {
-                      'text' => 'a'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'following_arg'
                     }
                   ],
-                  'type' => 'following_arg'
+                  'source_info' => {
+                    'file_name' => 'node_footnote.texi',
+                    'line_nr' => 19
+                  }
                 }
               ],
-              'source_info' => {
-                'file_name' => 'node_footnote.texi',
-                'line_nr' => 19
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -644,23 +653,28 @@ $result_trees{'node_footnote_use_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -676,24 +690,27 @@ $result_trees{'node_footnote_use_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -834,38 +851,41 @@ $result_trees{'node_footnote_use_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => '`',
               'contents' => [
                 {
+                  'cmdname' => '`',
                   'contents' => [
                     {
-                      'text' => 'a'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'following_arg'
                     }
                   ],
-                  'type' => 'following_arg'
+                  'source_info' => {
+                    'file_name' => 'node_footnote.texi',
+                    'line_nr' => 31
+                  }
                 }
               ],
-              'source_info' => {
-                'file_name' => 'node_footnote.texi',
-                'line_nr' => 31
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -980,11 +1000,11 @@ $result_trees{'node_footnote_use_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[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]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_footnote_use_node'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_use_node'}{'contents'}[5]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[5]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'node_footnote_use_node'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/node_footnote_use_node_separate.pl 
b/tp/t/results/html_tests/node_footnote_use_node_separate.pl
index c9e0a71365..a7e753eb4e 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
@@ -48,24 +48,27 @@ $result_trees{'node_footnote_use_node_separate'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -376,38 +379,41 @@ $result_trees{'node_footnote_use_node_separate'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => '\'',
               'contents' => [
                 {
+                  'cmdname' => '\'',
                   'contents' => [
                     {
-                      'text' => 'a'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'following_arg'
                     }
                   ],
-                  'type' => 'following_arg'
+                  'source_info' => {
+                    'file_name' => 'node_footnote.texi',
+                    'line_nr' => 14
+                  }
                 }
               ],
-              'source_info' => {
-                'file_name' => 'node_footnote.texi',
-                'line_nr' => 14
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -510,38 +516,41 @@ $result_trees{'node_footnote_use_node_separate'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => '^',
               'contents' => [
                 {
+                  'cmdname' => '^',
                   'contents' => [
                     {
-                      'text' => 'a'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'following_arg'
                     }
                   ],
-                  'type' => 'following_arg'
+                  'source_info' => {
+                    'file_name' => 'node_footnote.texi',
+                    'line_nr' => 19
+                  }
                 }
               ],
-              'source_info' => {
-                'file_name' => 'node_footnote.texi',
-                'line_nr' => 19
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -644,23 +653,28 @@ $result_trees{'node_footnote_use_node_separate'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -676,24 +690,27 @@ $result_trees{'node_footnote_use_node_separate'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -834,38 +851,41 @@ $result_trees{'node_footnote_use_node_separate'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => '`',
               'contents' => [
                 {
+                  'cmdname' => '`',
                   'contents' => [
                     {
-                      'text' => 'a'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'following_arg'
                     }
                   ],
-                  'type' => 'following_arg'
+                  'source_info' => {
+                    'file_name' => 'node_footnote.texi',
+                    'line_nr' => 31
+                  }
                 }
               ],
-              'source_info' => {
-                'file_name' => 'node_footnote.texi',
-                'line_nr' => 31
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -980,11 +1000,11 @@ $result_trees{'node_footnote_use_node_separate'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[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]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_footnote_use_node_separate'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_footnote_use_node_separate'}{'contents'}[5]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_footnote_use_node_separate'}{'contents'}[5]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'node_footnote_use_node_separate'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/nodedescription_description.pl 
b/tp/t/results/html_tests/nodedescription_description.pl
index 4b65bd18ba..8909d295f3 100644
--- a/tp/t/results/html_tests/nodedescription_description.pl
+++ b/tp/t/results/html_tests/nodedescription_description.pl
@@ -16,23 +16,28 @@ $result_trees{'nodedescription_description'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'nodedescription_description'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'test of descriptions with nodedescription*'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'test of descriptions with nodedescription*'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'nodedescription_description'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'toto'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'toto'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'node_description' => {
@@ -289,24 +302,27 @@ $result_trees{'nodedescription_description'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Toto'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Toto'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -338,23 +354,28 @@ $result_trees{'nodedescription_description'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'titi'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'titi'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'node_description' => {
@@ -434,24 +455,27 @@ $result_trees{'nodedescription_description'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Titi'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Titi'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -477,23 +501,28 @@ $result_trees{'nodedescription_description'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'other'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'other'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'node_description' => {
@@ -538,24 +567,27 @@ $result_trees{'nodedescription_description'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Other'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Other'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -580,13 +612,13 @@ $result_trees{'nodedescription_description'} = {
 };
 
$result_trees{'nodedescription_description'}{'contents'}[3]{'extra'}{'node_description'}{'extra'}{'element_node'}
 = $result_trees{'nodedescription_description'}{'contents'}[3];
 
$result_trees{'nodedescription_description'}{'contents'}[3]{'extra'}{'node_long_description'}{'extra'}{'element_node'}
 = $result_trees{'nodedescription_description'}{'contents'}[3];
-$result_trees{'nodedescription_description'}{'contents'}[4]{'contents'}[1] = 
$result_trees{'nodedescription_description'}{'contents'}[3]{'extra'}{'node_description'};
-$result_trees{'nodedescription_description'}{'contents'}[4]{'contents'}[3] = 
$result_trees{'nodedescription_description'}{'contents'}[3]{'extra'}{'node_long_description'};
+$result_trees{'nodedescription_description'}{'contents'}[4]{'contents'}[2] = 
$result_trees{'nodedescription_description'}{'contents'}[3]{'extra'}{'node_description'};
+$result_trees{'nodedescription_description'}{'contents'}[4]{'contents'}[4] = 
$result_trees{'nodedescription_description'}{'contents'}[3]{'extra'}{'node_long_description'};
 
$result_trees{'nodedescription_description'}{'contents'}[5]{'extra'}{'node_description'}{'extra'}{'element_node'}
 = $result_trees{'nodedescription_description'}{'contents'}[5];
 
$result_trees{'nodedescription_description'}{'contents'}[5]{'extra'}{'node_long_description'}
 = 
$result_trees{'nodedescription_description'}{'contents'}[5]{'extra'}{'node_description'};
-$result_trees{'nodedescription_description'}{'contents'}[6]{'contents'}[1] = 
$result_trees{'nodedescription_description'}{'contents'}[5]{'extra'}{'node_description'};
+$result_trees{'nodedescription_description'}{'contents'}[6]{'contents'}[2] = 
$result_trees{'nodedescription_description'}{'contents'}[5]{'extra'}{'node_description'};
 
$result_trees{'nodedescription_description'}{'contents'}[7]{'extra'}{'node_description'}{'extra'}{'element_node'}
 = $result_trees{'nodedescription_description'}{'contents'}[7];
-$result_trees{'nodedescription_description'}{'contents'}[8]{'contents'}[1] = 
$result_trees{'nodedescription_description'}{'contents'}[7]{'extra'}{'node_description'};
+$result_trees{'nodedescription_description'}{'contents'}[8]{'contents'}[2] = 
$result_trees{'nodedescription_description'}{'contents'}[7]{'extra'}{'node_description'};
 
 $result_texis{'nodedescription_description'} = '@node Top
 @top test of descriptions with nodedescription*
diff --git 
a/tp/t/results/html_tests/nodedescription_description_no_use_nodes.pl 
b/tp/t/results/html_tests/nodedescription_description_no_use_nodes.pl
index 8dc1335489..04979547af 100644
--- a/tp/t/results/html_tests/nodedescription_description_no_use_nodes.pl
+++ b/tp/t/results/html_tests/nodedescription_description_no_use_nodes.pl
@@ -16,23 +16,28 @@ $result_trees{'nodedescription_description_no_use_nodes'} = 
{
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'nodedescription_description_no_use_nodes'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'test of descriptions with nodedescription*'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'test of descriptions with nodedescription*'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'nodedescription_description_no_use_nodes'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'toto'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'toto'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'node_description' => {
@@ -289,24 +302,27 @@ $result_trees{'nodedescription_description_no_use_nodes'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Toto'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Toto'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -338,23 +354,28 @@ $result_trees{'nodedescription_description_no_use_nodes'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'titi'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'titi'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'node_description' => {
@@ -434,24 +455,27 @@ $result_trees{'nodedescription_description_no_use_nodes'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Titi'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Titi'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -477,23 +501,28 @@ $result_trees{'nodedescription_description_no_use_nodes'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'other'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'other'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'node_description' => {
@@ -538,24 +567,27 @@ $result_trees{'nodedescription_description_no_use_nodes'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Other'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Other'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -580,13 +612,13 @@ $result_trees{'nodedescription_description_no_use_nodes'} 
= {
 };
 
$result_trees{'nodedescription_description_no_use_nodes'}{'contents'}[3]{'extra'}{'node_description'}{'extra'}{'element_node'}
 = $result_trees{'nodedescription_description_no_use_nodes'}{'contents'}[3];
 
$result_trees{'nodedescription_description_no_use_nodes'}{'contents'}[3]{'extra'}{'node_long_description'}{'extra'}{'element_node'}
 = $result_trees{'nodedescription_description_no_use_nodes'}{'contents'}[3];
-$result_trees{'nodedescription_description_no_use_nodes'}{'contents'}[4]{'contents'}[1]
 = 
$result_trees{'nodedescription_description_no_use_nodes'}{'contents'}[3]{'extra'}{'node_description'};
-$result_trees{'nodedescription_description_no_use_nodes'}{'contents'}[4]{'contents'}[3]
 = 
$result_trees{'nodedescription_description_no_use_nodes'}{'contents'}[3]{'extra'}{'node_long_description'};
+$result_trees{'nodedescription_description_no_use_nodes'}{'contents'}[4]{'contents'}[2]
 = 
$result_trees{'nodedescription_description_no_use_nodes'}{'contents'}[3]{'extra'}{'node_description'};
+$result_trees{'nodedescription_description_no_use_nodes'}{'contents'}[4]{'contents'}[4]
 = 
$result_trees{'nodedescription_description_no_use_nodes'}{'contents'}[3]{'extra'}{'node_long_description'};
 
$result_trees{'nodedescription_description_no_use_nodes'}{'contents'}[5]{'extra'}{'node_description'}{'extra'}{'element_node'}
 = $result_trees{'nodedescription_description_no_use_nodes'}{'contents'}[5];
 
$result_trees{'nodedescription_description_no_use_nodes'}{'contents'}[5]{'extra'}{'node_long_description'}
 = 
$result_trees{'nodedescription_description_no_use_nodes'}{'contents'}[5]{'extra'}{'node_description'};
-$result_trees{'nodedescription_description_no_use_nodes'}{'contents'}[6]{'contents'}[1]
 = 
$result_trees{'nodedescription_description_no_use_nodes'}{'contents'}[5]{'extra'}{'node_description'};
+$result_trees{'nodedescription_description_no_use_nodes'}{'contents'}[6]{'contents'}[2]
 = 
$result_trees{'nodedescription_description_no_use_nodes'}{'contents'}[5]{'extra'}{'node_description'};
 
$result_trees{'nodedescription_description_no_use_nodes'}{'contents'}[7]{'extra'}{'node_description'}{'extra'}{'element_node'}
 = $result_trees{'nodedescription_description_no_use_nodes'}{'contents'}[7];
-$result_trees{'nodedescription_description_no_use_nodes'}{'contents'}[8]{'contents'}[1]
 = 
$result_trees{'nodedescription_description_no_use_nodes'}{'contents'}[7]{'extra'}{'node_description'};
+$result_trees{'nodedescription_description_no_use_nodes'}{'contents'}[8]{'contents'}[2]
 = 
$result_trees{'nodedescription_description_no_use_nodes'}{'contents'}[7]{'extra'}{'node_description'};
 
 $result_texis{'nodedescription_description_no_use_nodes'} = '@node Top
 @top test of descriptions with nodedescription*
diff --git a/tp/t/results/html_tests/redirection_same_labels.pl 
b/tp/t/results/html_tests/redirection_same_labels.pl
index 3d012f1c2a..a2303a41fe 100644
--- a/tp/t/results/html_tests/redirection_same_labels.pl
+++ b/tp/t/results/html_tests/redirection_same_labels.pl
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'redirection_same_labels'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'the top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'the top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -241,23 +244,28 @@ $result_trees{'redirection_same_labels'} = [
         'type' => 'before_node_section'
       },
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'Top'
@@ -277,24 +285,27 @@ $result_trees{'redirection_same_labels'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'umlaut'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'umlaut'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -503,23 +514,28 @@ $result_trees{'redirection_same_labels'} = [
     },
     'unit_contents' => [
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'umlaut'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'umlaut'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'umlaut'
@@ -535,37 +551,40 @@ $result_trees{'redirection_same_labels'} = [
       },
       {},
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'cmdname' => '"',
                 'contents' => [
                   {
+                    'cmdname' => '"',
                     'contents' => [
                       {
-                        'text' => 'i'
+                        'contents' => [
+                          {
+                            'text' => 'i'
+                          }
+                        ],
+                        'type' => 'following_arg'
                       }
                     ],
-                    'type' => 'following_arg'
+                    'source_info' => {
+                      'line_nr' => 20
+                    }
                   }
                 ],
-                'source_info' => {
-                  'line_nr' => 20
-                }
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'node',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -586,50 +605,53 @@ $result_trees{'redirection_same_labels'} = [
         }
       },
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'cmdname' => '~',
                 'contents' => [
                   {
+                    'cmdname' => '~',
                     'contents' => [
                       {
-                        'cmdname' => 'dotless',
                         'contents' => [
                           {
+                            'cmdname' => 'dotless',
                             'contents' => [
                               {
-                                'text' => 'i'
+                                'contents' => [
+                                  {
+                                    'text' => 'i'
+                                  }
+                                ],
+                                'type' => 'brace_container'
                               }
                             ],
-                            'type' => 'brace_container'
+                            'source_info' => {
+                              'line_nr' => 22
+                            }
                           }
                         ],
-                        'source_info' => {
-                          'line_nr' => 22
-                        }
+                        'type' => 'brace_container'
                       }
                     ],
-                    'type' => 'brace_container'
+                    'source_info' => {
+                      'line_nr' => 22
+                    }
                   }
                 ],
-                'source_info' => {
-                  'line_nr' => 22
-                }
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'node',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -654,24 +676,27 @@ $result_trees{'redirection_same_labels'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'circumflex'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'circumflex'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -808,23 +833,28 @@ $result_trees{'redirection_same_labels'} = [
     },
     'unit_contents' => [
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'circumflex'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'circumflex'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'circumflex'
@@ -840,36 +870,41 @@ $result_trees{'redirection_same_labels'} = [
       },
       {},
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'cmdname' => '^',
                 'contents' => [
                   {
+                    'cmdname' => '^',
                     'contents' => [
                       {
-                        'text' => 'i'
+                        'contents' => [
+                          {
+                            'text' => 'i'
+                          }
+                        ],
+                        'type' => 'following_arg'
                       }
                     ],
-                    'type' => 'following_arg'
+                    'source_info' => {
+                      'line_nr' => 31
+                    }
                   }
                 ],
-                'source_info' => {
-                  'line_nr' => 31
-                }
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => '_00ee'
@@ -887,13 +922,13 @@ $result_trees{'redirection_same_labels'} = [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'redirection_same_labels'}[0]{'unit_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'redirection_same_labels'}[0]{'unit_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'redirection_same_labels'}[0]{'unit_command'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'redirection_same_labels'}[0]{'unit_command'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'redirection_same_labels'}[0]{'unit_command'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'redirection_same_labels'}[0]{'unit_command'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'redirection_same_labels'}[0]{'unit_command'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'redirection_same_labels'}[0]{'unit_command'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
 $result_trees{'redirection_same_labels'}[0]{'unit_contents'}[2] = 
$result_trees{'redirection_same_labels'}[0]{'unit_command'};
-$result_trees{'redirection_same_labels'}[1]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'redirection_same_labels'}[1]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'redirection_same_labels'}[1]{'unit_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'redirection_same_labels'}[1]{'unit_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'redirection_same_labels'}[1]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'redirection_same_labels'}[1]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'redirection_same_labels'}[1]{'unit_command'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'redirection_same_labels'}[1]{'unit_command'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 $result_trees{'redirection_same_labels'}[1]{'unit_contents'}[1] = 
$result_trees{'redirection_same_labels'}[1]{'unit_command'};
-$result_trees{'redirection_same_labels'}[2]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'redirection_same_labels'}[2]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'redirection_same_labels'}[2]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'redirection_same_labels'}[2]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 $result_trees{'redirection_same_labels'}[2]{'unit_contents'}[1] = 
$result_trees{'redirection_same_labels'}[2]{'unit_command'};
 
 $result_texis{'redirection_same_labels'} = '@node Top
diff --git a/tp/t/results/html_tests/ref_in_preformatted.pl 
b/tp/t/results/html_tests/ref_in_preformatted.pl
index be5dc7f07c..077594955d 100644
--- a/tp/t/results/html_tests/ref_in_preformatted.pl
+++ b/tp/t/results/html_tests/ref_in_preformatted.pl
@@ -11,24 +11,27 @@ $result_trees{'ref_in_preformatted'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -250,23 +253,28 @@ $result_trees{'ref_in_preformatted'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap nnn the node name'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap nnn the node name'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap-nnn-the-node-name'
@@ -283,9 +291,9 @@ $result_trees{'ref_in_preformatted'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1];
+$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
 $result_texis{'ref_in_preformatted'} = '@node Top
 
diff --git a/tp/t/results/html_tests/sectioning_check_menu_structure.pl 
b/tp/t/results/html_tests/sectioning_check_menu_structure.pl
index dde9f9498b..d1a7cc692a 100644
--- a/tp/t/results/html_tests/sectioning_check_menu_structure.pl
+++ b/tp/t/results/html_tests/sectioning_check_menu_structure.pl
@@ -31,60 +31,65 @@ $result_trees{'sectioning_check_menu_structure'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'Top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'First node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
-            },
-            'normalized' => 'First-node'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'type' => 'line_arg'
             },
             {
-              'text' => 'dir'
+              'contents' => [
+                {
+                  'text' => 'First node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'First-node'
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -100,19 +105,22 @@ $result_trees{'sectioning_check_menu_structure'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'menu',
           'contents' => [
@@ -579,58 +587,63 @@ $result_trees{'sectioning_check_menu_structure'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'First node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'First node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'First-node'
@@ -646,24 +659,27 @@ $result_trees{'sectioning_check_menu_structure'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first node chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first node chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -908,23 +924,28 @@ $result_trees{'sectioning_check_menu_structure'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumbered'
@@ -940,24 +961,27 @@ $result_trees{'sectioning_check_menu_structure'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1223,23 +1247,28 @@ $result_trees{'sectioning_check_menu_structure'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered sub'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered sub'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumbered-sub'
@@ -1255,24 +1284,27 @@ $result_trees{'sectioning_check_menu_structure'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsubsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsubsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1291,23 +1323,28 @@ $result_trees{'sectioning_check_menu_structure'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered sub'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered sub'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'numbered-sub'
@@ -1323,24 +1360,27 @@ $result_trees{'sectioning_check_menu_structure'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1359,23 +1399,28 @@ $result_trees{'sectioning_check_menu_structure'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered sub2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered sub2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumbered-sub2'
@@ -1391,24 +1436,27 @@ $result_trees{'sectioning_check_menu_structure'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsubsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered subsection2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered subsection2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsubsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1427,23 +1475,28 @@ $result_trees{'sectioning_check_menu_structure'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered sub2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered sub2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'numbered-sub2'
@@ -1459,24 +1512,27 @@ $result_trees{'sectioning_check_menu_structure'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered subsection2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered subsection2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1495,23 +1551,28 @@ $result_trees{'sectioning_check_menu_structure'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumbered2'
@@ -1527,24 +1588,27 @@ $result_trees{'sectioning_check_menu_structure'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered section2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered section2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1669,23 +1733,28 @@ $result_trees{'sectioning_check_menu_structure'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered sub3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered sub3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'numbered-sub3'
@@ -1701,24 +1770,27 @@ $result_trees{'sectioning_check_menu_structure'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered subsection3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered subsection3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1742,23 +1814,28 @@ $result_trees{'sectioning_check_menu_structure'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'numbered'
@@ -1774,24 +1851,27 @@ $result_trees{'sectioning_check_menu_structure'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1812,46 +1892,49 @@ $result_trees{'sectioning_check_menu_structure'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'between node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'between node'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1887,59 +1970,62 @@ $result_trees{'sectioning_check_menu_structure'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'Second node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Third node unnumbered'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Second node'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'Third-node-unnumbered'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Third node unnumbered'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Third-node-unnumbered'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1975,24 +2061,27 @@ $result_trees{'sectioning_check_menu_structure'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second node chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'second node chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2027,23 +2116,28 @@ $result_trees{'sectioning_check_menu_structure'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Third node unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Third node unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Third-node-unnumbered'
@@ -2059,24 +2153,27 @@ $result_trees{'sectioning_check_menu_structure'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2114,59 +2211,62 @@ $result_trees{'sectioning_check_menu_structure'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'Last node no description'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Third node unnumbered'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Last node no description'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'Third-node-unnumbered'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Third node unnumbered'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Third-node-unnumbered'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2225,28 +2325,28 @@ $result_trees{'sectioning_check_menu_structure'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'sectioning_check_menu_structure'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'sectioning_check_menu_structure'}{'contents'}[1]{'args'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[1]{'args'}[2]{'contents'}[1];
-$result_trees{'sectioning_check_menu_structure'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'sectioning_check_menu_structure'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'sectioning_check_menu_structure'}{'contents'}[2]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[2]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'sectioning_check_menu_structure'}{'contents'}[2]{'contents'}[0]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[2]{'contents'}[0]{'contents'}[7]{'contents'}[1]{'contents'}[0];
-$result_trees{'sectioning_check_menu_structure'}{'contents'}[2]{'contents'}[0]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[2]{'contents'}[0]{'contents'}[8]{'contents'}[1]{'contents'}[0];
-$result_trees{'sectioning_check_menu_structure'}{'contents'}[3]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'sectioning_check_menu_structure'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-$result_trees{'sectioning_check_menu_structure'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'sectioning_check_menu_structure'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'sectioning_check_menu_structure'}{'contents'}[4]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[4]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'sectioning_check_menu_structure'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'sectioning_check_menu_structure'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'sectioning_check_menu_structure'}{'contents'}[6]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[6]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'sectioning_check_menu_structure'}{'contents'}[6]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[6]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'sectioning_check_menu_structure'}{'contents'}[16]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[16]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'sectioning_check_menu_structure'}{'contents'}[21]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[21]{'args'}[3]{'contents'}[0];
-$result_trees{'sectioning_check_menu_structure'}{'contents'}[22]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[22]{'args'}[1]{'contents'}[0];
-$result_trees{'sectioning_check_menu_structure'}{'contents'}[22]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[22]{'args'}[3]{'contents'}[0];
-$result_trees{'sectioning_check_menu_structure'}{'contents'}[26]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[26]{'args'}[2]{'contents'}[0];
-$result_trees{'sectioning_check_menu_structure'}{'contents'}[26]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[26]{'args'}[3]{'contents'}[0];
+$result_trees{'sectioning_check_menu_structure'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'sectioning_check_menu_structure'}{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'sectioning_check_menu_structure'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'sectioning_check_menu_structure'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'sectioning_check_menu_structure'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'sectioning_check_menu_structure'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0];
+$result_trees{'sectioning_check_menu_structure'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0];
+$result_trees{'sectioning_check_menu_structure'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'sectioning_check_menu_structure'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'sectioning_check_menu_structure'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'sectioning_check_menu_structure'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'sectioning_check_menu_structure'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'sectioning_check_menu_structure'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'sectioning_check_menu_structure'}{'contents'}[6]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[6]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'sectioning_check_menu_structure'}{'contents'}[6]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[6]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'sectioning_check_menu_structure'}{'contents'}[6]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[6]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'sectioning_check_menu_structure'}{'contents'}[16]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[16]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'sectioning_check_menu_structure'}{'contents'}[21]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[21]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'sectioning_check_menu_structure'}{'contents'}[22]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[22]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'sectioning_check_menu_structure'}{'contents'}[22]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[22]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'sectioning_check_menu_structure'}{'contents'}[26]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[26]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'sectioning_check_menu_structure'}{'contents'}[26]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sectioning_check_menu_structure'}{'contents'}[26]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'sectioning_check_menu_structure'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/html_tests/set_unit_file_name_filepath.pl 
b/tp/t/results/html_tests/set_unit_file_name_filepath.pl
index c69cafb213..6d09a256fe 100644
--- a/tp/t/results/html_tests/set_unit_file_name_filepath.pl
+++ b/tp/t/results/html_tests/set_unit_file_name_filepath.pl
@@ -16,23 +16,28 @@ $result_trees{'set_unit_file_name_filepath'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'set_unit_file_name_filepath'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'set_unit_file_name_filepath'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -113,23 +126,28 @@ $result_trees{'set_unit_file_name_filepath'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
diff --git a/tp/t/results/html_tests/shortcontents_no_top.pl 
b/tp/t/results/html_tests/shortcontents_no_top.pl
index cd3dac36b5..528bf445ca 100644
--- a/tp/t/results/html_tests/shortcontents_no_top.pl
+++ b/tp/t/results/html_tests/shortcontents_no_top.pl
@@ -11,24 +11,27 @@ $result_trees{'shortcontents_no_top'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -48,24 +51,27 @@ $result_trees{'shortcontents_no_top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -85,24 +91,27 @@ $result_trees{'shortcontents_no_top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/html_tests/shorttitlepage.pl 
b/tp/t/results/html_tests/shorttitlepage.pl
index 97d9a8aea7..d52a9ba439 100644
--- a/tp/t/results/html_tests/shorttitlepage.pl
+++ b/tp/t/results/html_tests/shorttitlepage.pl
@@ -88,23 +88,28 @@ $result_trees{'shorttitlepage'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -119,65 +124,68 @@ $result_trees{'shorttitlepage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top of '
-            },
-            {
-              'cmdname' => '@'
-            },
-            {
-              'text' => 'title '
-            },
-            {
-              'cmdname' => 'sc',
               'contents' => [
                 {
+                  'text' => 'Top of '
+                },
+                {
+                  'cmdname' => '@'
+                },
+                {
+                  'text' => 'title '
+                },
+                {
+                  'cmdname' => 'sc',
                   'contents' => [
                     {
-                      'text' => 'html'
+                      'contents' => [
+                        {
+                          'text' => 'html'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 5
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'code',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 5
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'code',
                   'contents' => [
                     {
-                      'text' => 'test'
+                      'contents' => [
+                        {
+                          'text' => 'test'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 5
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 5
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/html_tests/simple_only_special_spaces_node.pl 
b/tp/t/results/html_tests/simple_only_special_spaces_node.pl
index e4d7c81da6..250757cf2d 100644
--- a/tp/t/results/html_tests/simple_only_special_spaces_node.pl
+++ b/tp/t/results/html_tests/simple_only_special_spaces_node.pl
@@ -16,22 +16,27 @@ $result_trees{'simple_only_special_spaces_node'} = {
       "type" => "before_node_section"
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "Top"
+              "contents" => [
+                {
+                  "text" => "Top"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {
         "is_target" => 1,
         "normalized" => "Top"
@@ -47,23 +52,26 @@ $result_trees{'simple_only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "top",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "top"
+              "contents" => [
+                {
+                  "text" => "top"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "top",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -81,22 +89,27 @@ $result_trees{'simple_only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "\x{2000}\x{2001}"
+              "contents" => [
+                {
+                  "text" => "\x{2000}\x{2001}"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {
         "is_target" => 1,
         "normalized" => "_2002_2003"
@@ -112,23 +125,26 @@ $result_trees{'simple_only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "chapter",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "EN QUAD|\x{2000}|"
+              "contents" => [
+                {
+                  "text" => "EN QUAD|\x{2000}|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "chapter",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -148,17 +164,22 @@ $result_trees{'simple_only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => " \r\n"
+          "contents" => [
+            {
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => " \r\n"
+                }
+              },
+              "type" => "line_arg"
             }
-          },
-          "type" => "line_arg"
+          ],
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {},
       "source_info" => {
         "file_name" => "simple_only_special_spaces_node.texi",
@@ -166,23 +187,26 @@ $result_trees{'simple_only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "chapter",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "CARRIAGE RETURN|\r|"
+              "contents" => [
+                {
+                  "text" => "CARRIAGE RETURN|\r|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "chapter",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -202,22 +226,27 @@ $result_trees{'simple_only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "\x{2004}\x{2005}"
+              "contents" => [
+                {
+                  "text" => "\x{2004}\x{2005}"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {
         "is_target" => 1,
         "normalized" => "_2004_2005"
@@ -233,23 +262,26 @@ $result_trees{'simple_only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "chapter",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "THREE-PER-EM SPACE"
+              "contents" => [
+                {
+                  "text" => "THREE-PER-EM SPACE"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "chapter",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
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 c4787bf133..ce26f5e549 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
@@ -31,24 +31,27 @@ $result_trees{'simplest_test_date_in_header'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/html_tests/split_html_text.pl 
b/tp/t/results/html_tests/split_html_text.pl
index 4962f89485..9b30f3d27f 100644
--- a/tp/t/results/html_tests/split_html_text.pl
+++ b/tp/t/results/html_tests/split_html_text.pl
@@ -8,23 +8,28 @@ use utf8;
 $result_trees{'split_html_text'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -44,24 +49,27 @@ $result_trees{'split_html_text'} = [
       },
       {},
       {
-        'args' => [
+        'cmdname' => 'top',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'top'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'top'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'top',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'contents' => [
               {
@@ -92,23 +100,28 @@ $result_trees{'split_html_text'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -125,23 +138,28 @@ $result_trees{'split_html_text'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'chapter',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Chap'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Chap'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'chapter',
         'extra' => {
           'section_number' => '1'
         },
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 8b7950b775..1d983c1c05 100644
--- a/tp/t/results/html_tests/test_accents_sc_default.pl
+++ b/tp/t/results/html_tests/test_accents_sc_default.pl
@@ -31,23 +31,28 @@ $result_trees{'test_accents_sc_default'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'test_accents_sc_default'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -99,23 +107,28 @@ $result_trees{'test_accents_sc_default'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-chap'
@@ -131,24 +144,27 @@ $result_trees{'test_accents_sc_default'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 4224c30c4f..a4f379b7cd 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
@@ -70,23 +70,28 @@ $result_trees{'test_accents_sc_default_latin1'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -102,24 +107,27 @@ $result_trees{'test_accents_sc_default_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -138,23 +146,28 @@ $result_trees{'test_accents_sc_default_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-chap'
@@ -170,24 +183,27 @@ $result_trees{'test_accents_sc_default_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 5f9a109046..1b7249655c 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
@@ -70,23 +70,28 @@ $result_trees{'test_accents_sc_default_usascii'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -102,24 +107,27 @@ $result_trees{'test_accents_sc_default_usascii'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -138,23 +146,28 @@ $result_trees{'test_accents_sc_default_usascii'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-chap'
@@ -170,24 +183,27 @@ $result_trees{'test_accents_sc_default_usascii'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 840aa3cdac..dd06f6bbbb 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
@@ -31,23 +31,28 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -99,23 +107,28 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-chap'
@@ -131,24 +144,27 @@ $result_trees{'test_accents_sc_enable_encoding'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 3cc9542892..36078bbfd6 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
@@ -70,23 +70,28 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -102,24 +107,27 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -138,23 +146,28 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-chap'
@@ -170,24 +183,27 @@ $result_trees{'test_accents_sc_enable_encoding_latin1'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 c0505ee13b..65fe2ebd25 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
@@ -70,23 +70,28 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -102,24 +107,27 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -138,23 +146,28 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-chap'
@@ -170,24 +183,27 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 c2f9d96dcf..7d23b49901 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
@@ -70,23 +70,28 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -102,24 +107,27 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -138,23 +146,28 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-chap'
@@ -170,24 +183,27 @@ 
$result_trees{'test_accents_sc_enable_encoding_to_utf8_usascii'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 7227715416..b71c75d5d8 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
@@ -70,23 +70,28 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -102,24 +107,27 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -138,23 +146,28 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-chap'
@@ -170,24 +183,27 @@ $result_trees{'test_accents_sc_enable_encoding_usascii'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 ba9a8dd356..c428ab9f07 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
@@ -70,23 +70,28 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -102,24 +107,27 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -138,23 +146,28 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-chap'
@@ -170,24 +183,27 @@ $result_trees{'test_accents_sc_to_utf8_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 02d7da2f10..10e14c38ae 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
@@ -31,23 +31,28 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -99,23 +107,28 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-chap'
@@ -131,24 +144,27 @@ $result_trees{'test_accents_sc_use_numeric_entity'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/html_tests/test_separated_contents_shortcontents.pl 
b/tp/t/results/html_tests/test_separated_contents_shortcontents.pl
index d6fb8bd011..a46fc7f5ac 100644
--- a/tp/t/results/html_tests/test_separated_contents_shortcontents.pl
+++ b/tp/t/results/html_tests/test_separated_contents_shortcontents.pl
@@ -37,23 +37,28 @@ $result_trees{'test_separated_contents_shortcontents'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -68,24 +73,27 @@ $result_trees{'test_separated_contents_shortcontents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -103,23 +111,28 @@ $result_trees{'test_separated_contents_shortcontents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -134,24 +147,27 @@ $result_trees{'test_separated_contents_shortcontents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -171,23 +187,28 @@ $result_trees{'test_separated_contents_shortcontents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'app'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'app'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'app'
@@ -202,24 +223,27 @@ $result_trees{'test_separated_contents_shortcontents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'appendix'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'appendix'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl 
b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
index 87e6d2120b..ff0e7e7f74 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
@@ -11,23 +11,28 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -180,23 +188,28 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -211,24 +224,27 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -395,9 +411,9 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[4]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[4]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'test_xrefautomaticsectiontitle'} = '@node Top
 @top top
diff --git 
a/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl 
b/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
index d75a566751..427314e30c 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
@@ -55,23 +55,28 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -86,24 +91,27 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -224,23 +232,28 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -255,24 +268,27 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -402,9 +418,9 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
   ],
   'type' => 'document_root'
 };
-$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'test_xrefautomaticsectiontitle_off_first'} = '
 @xrefautomaticsectiontitle off
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 af2ec0d9e9..835137d661 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
@@ -32,23 +32,28 @@ $result_trees{'text_before_top_and_contents_after_title'} = 
{
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'text_before_top_and_contents_after_title'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -112,24 +120,27 @@ $result_trees{'text_before_top_and_contents_after_title'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'the chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'the chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 c4cfd77f9f..27c8e36ff7 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
@@ -32,23 +32,28 @@ 
$result_trees{'text_before_top_and_summarycontents_after_title'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ 
$result_trees{'text_before_top_and_summarycontents_after_title'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -112,24 +120,27 @@ 
$result_trees{'text_before_top_and_summarycontents_after_title'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'the chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'the chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/html_tests/text_css_info_in_init.pl 
b/tp/t/results/html_tests/text_css_info_in_init.pl
index 72a735c727..48375ea2b2 100644
--- a/tp/t/results/html_tests/text_css_info_in_init.pl
+++ b/tp/t/results/html_tests/text_css_info_in_init.pl
@@ -16,23 +16,28 @@ $result_trees{'text_css_info_in_init'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'text_css_info_in_init'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/html_tests/titles.pl 
b/tp/t/results/html_tests/titles.pl
index 6c859758e0..4b886b7950 100644
--- a/tp/t/results/html_tests/titles.pl
+++ b/tp/t/results/html_tests/titles.pl
@@ -88,23 +88,28 @@ $result_trees{'titles'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -119,65 +124,68 @@ $result_trees{'titles'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top of '
-            },
-            {
-              'cmdname' => '@'
-            },
-            {
-              'text' => 'title '
-            },
-            {
-              'cmdname' => 'sc',
               'contents' => [
                 {
+                  'text' => 'Top of '
+                },
+                {
+                  'cmdname' => '@'
+                },
+                {
+                  'text' => 'title '
+                },
+                {
+                  'cmdname' => 'sc',
                   'contents' => [
                     {
-                      'text' => 'html'
+                      'contents' => [
+                        {
+                          'text' => 'html'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 5
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'code',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 5
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'code',
                   'contents' => [
                     {
-                      'text' => 'test'
+                      'contents' => [
+                        {
+                          'text' => 'test'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 5
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 5
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/html_tests/top_file_name_and_node_name_collision.pl 
b/tp/t/results/html_tests/top_file_name_and_node_name_collision.pl
index ef15739033..038365e1c0 100644
--- a/tp/t/results/html_tests/top_file_name_and_node_name_collision.pl
+++ b/tp/t/results/html_tests/top_file_name_and_node_name_collision.pl
@@ -16,23 +16,28 @@ $result_trees{'top_file_name_and_node_name_collision'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'my node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'my node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'my-node'
@@ -47,24 +52,27 @@ $result_trees{'top_file_name_and_node_name_collision'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap my node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap my node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -84,23 +92,28 @@ $result_trees{'top_file_name_and_node_name_collision'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'other node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'other node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'other-node'
@@ -115,24 +128,27 @@ $result_trees{'top_file_name_and_node_name_collision'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -152,24 +168,27 @@ $result_trees{'top_file_name_and_node_name_collision'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/html_tests/top_node_top_contents.pl 
b/tp/t/results/html_tests/top_node_top_contents.pl
index b3376b367e..82937e250e 100644
--- a/tp/t/results/html_tests/top_node_top_contents.pl
+++ b/tp/t/results/html_tests/top_node_top_contents.pl
@@ -37,23 +37,28 @@ $result_trees{'top_node_top_contents'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -68,23 +73,28 @@ $result_trees{'top_node_top_contents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Texinfo modules documentation'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Texinfo modules documentation'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'top',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
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 3acaf696e7..0c7663782e 100644
--- a/tp/t/results/html_tests/top_node_up_explicit.pl
+++ b/tp/t/results/html_tests/top_node_up_explicit.pl
@@ -11,99 +11,104 @@ $result_trees{'top_node_up_explicit'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'Top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '('
-            },
-            {
-              'text' => 'dir'
-            },
-            {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
-            },
-            {
-              'text' => 'weird'
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => 'dir'
+              'contents' => [
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'weird'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -118,24 +123,27 @@ $result_trees{'top_node_up_explicit'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'The top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'The top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -270,23 +278,28 @@ $result_trees{'top_node_up_explicit'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Chap'
@@ -301,24 +314,27 @@ $result_trees{'top_node_up_explicit'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'A chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'A chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -349,10 +365,10 @@ $result_trees{'top_node_up_explicit'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'top_node_up_explicit'}{'contents'}[1]{'args'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_node_up_explicit'}{'contents'}[1]{'args'}[1]{'contents'}[1];
-$result_trees{'top_node_up_explicit'}{'contents'}[1]{'args'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_node_up_explicit'}{'contents'}[1]{'args'}[2]{'contents'}[1];
-$result_trees{'top_node_up_explicit'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_node_up_explicit'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'top_node_up_explicit'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_node_up_explicit'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'top_node_up_explicit'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_node_up_explicit'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'top_node_up_explicit'}{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_node_up_explicit'}{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'top_node_up_explicit'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_node_up_explicit'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'top_node_up_explicit'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_node_up_explicit'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'top_node_up_explicit'} = '@node Top, (dir), (weird), (dir)
 @top The top
diff --git a/tp/t/results/html_tests/top_node_up_explicit_no_nodes.pl 
b/tp/t/results/html_tests/top_node_up_explicit_no_nodes.pl
index a48fce3b92..e07905d946 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
@@ -11,99 +11,104 @@ $result_trees{'top_node_up_explicit_no_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'Top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '('
-            },
-            {
-              'text' => 'dir'
-            },
-            {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
-            },
-            {
-              'text' => 'weird'
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => 'dir'
+              'contents' => [
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'weird'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -118,24 +123,27 @@ $result_trees{'top_node_up_explicit_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'The top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'The top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -270,23 +278,28 @@ $result_trees{'top_node_up_explicit_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Chap'
@@ -301,24 +314,27 @@ $result_trees{'top_node_up_explicit_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'A chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'A chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -349,10 +365,10 @@ $result_trees{'top_node_up_explicit_no_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'args'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'args'}[1]{'contents'}[1];
-$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'args'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'args'}[2]{'contents'}[1];
-$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}{'contents'}[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'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'top_node_up_explicit_no_nodes'} = '@node Top, (dir), (weird), 
(dir)
 @top The top
diff --git a/tp/t/results/html_tests/top_node_up_implicit.pl 
b/tp/t/results/html_tests/top_node_up_implicit.pl
index 31ea9b6a72..47e080a17f 100644
--- a/tp/t/results/html_tests/top_node_up_implicit.pl
+++ b/tp/t/results/html_tests/top_node_up_implicit.pl
@@ -11,23 +11,28 @@ $result_trees{'top_node_up_implicit'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'top_node_up_implicit'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'The top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'The top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -194,23 +202,28 @@ $result_trees{'top_node_up_implicit'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Chap'
@@ -225,24 +238,27 @@ $result_trees{'top_node_up_implicit'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'A chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'A chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -273,7 +289,7 @@ $result_trees{'top_node_up_implicit'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'top_node_up_implicit'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_node_up_implicit'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'top_node_up_implicit'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_node_up_implicit'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'top_node_up_implicit'} = '@node Top
 @top The top
diff --git a/tp/t/results/html_tests/top_node_up_implicit_no_nodes.pl 
b/tp/t/results/html_tests/top_node_up_implicit_no_nodes.pl
index 63f898b6f4..82219097c2 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
@@ -11,23 +11,28 @@ $result_trees{'top_node_up_implicit_no_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'top_node_up_implicit_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'The top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'The top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -194,23 +202,28 @@ $result_trees{'top_node_up_implicit_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Chap'
@@ -225,24 +238,27 @@ $result_trees{'top_node_up_implicit_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'A chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'A chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -273,7 +289,7 @@ $result_trees{'top_node_up_implicit_no_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'top_node_up_implicit_no_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_node_up_implicit_no_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'top_node_up_implicit_no_nodes'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_node_up_implicit_no_nodes'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'top_node_up_implicit_no_nodes'} = '@node Top
 @top The top
diff --git a/tp/t/results/html_tests/transliterated_names_conflicts.pl 
b/tp/t/results/html_tests/transliterated_names_conflicts.pl
index b1e123e9aa..da07ad07f5 100644
--- a/tp/t/results/html_tests/transliterated_names_conflicts.pl
+++ b/tp/t/results/html_tests/transliterated_names_conflicts.pl
@@ -8,23 +8,28 @@ use utf8;
 $result_trees{'transliterated_names_conflicts'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -65,24 +70,27 @@ $result_trees{'transliterated_names_conflicts'} = [
       },
       {},
       {
-        'args' => [
+        'cmdname' => 'top',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Same transliterated names'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Same transliterated names'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'top',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -105,23 +113,28 @@ $result_trees{'transliterated_names_conflicts'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "Pr\x{e9}s"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "Pr\x{e9}s"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Pr_00e9s'
@@ -139,24 +152,27 @@ $result_trees{'transliterated_names_conflicts'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'chapter',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => "Pr\x{e9}s"
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => "Pr\x{e9}s"
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'chapter',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -181,23 +197,28 @@ $result_trees{'transliterated_names_conflicts'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Other node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Other node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Other-node'
@@ -215,24 +236,27 @@ $result_trees{'transliterated_names_conflicts'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'chapter',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Other chapter'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Other chapter'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'chapter',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -395,7 +419,7 @@ $result_trees{'transliterated_names_conflicts'} = [
 $result_trees{'transliterated_names_conflicts'}[0]{'unit_contents'}[1] = 
$result_trees{'transliterated_names_conflicts'}[0]{'unit_command'};
 $result_trees{'transliterated_names_conflicts'}[1]{'unit_contents'}[0] = 
$result_trees{'transliterated_names_conflicts'}[1]{'unit_command'};
 $result_trees{'transliterated_names_conflicts'}[2]{'unit_contents'}[0] = 
$result_trees{'transliterated_names_conflicts'}[2]{'unit_command'};
-$result_trees{'transliterated_names_conflicts'}[2]{'unit_contents'}[1]{'contents'}[4]{'extra'}{'float_section'}
 = $result_trees{'transliterated_names_conflicts'}[2]{'unit_contents'}[1];
+$result_trees{'transliterated_names_conflicts'}[2]{'unit_contents'}[1]{'contents'}[5]{'extra'}{'float_section'}
 = $result_trees{'transliterated_names_conflicts'}[2]{'unit_contents'}[1];
 
 $result_texis{'transliterated_names_conflicts'} = '\\input texinfo.tex
 
diff --git a/tp/t/results/html_tests/undef_split_and_big_rule.pl 
b/tp/t/results/html_tests/undef_split_and_big_rule.pl
index 98bf41ccb2..62675f87f7 100644
--- a/tp/t/results/html_tests/undef_split_and_big_rule.pl
+++ b/tp/t/results/html_tests/undef_split_and_big_rule.pl
@@ -25,24 +25,27 @@ $result_trees{'undef_split_and_big_rule'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -60,23 +63,28 @@ $result_trees{'undef_split_and_big_rule'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -91,24 +99,27 @@ $result_trees{'undef_split_and_big_rule'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -128,23 +139,28 @@ $result_trees{'undef_split_and_big_rule'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sec'
@@ -159,23 +175,28 @@ $result_trees{'undef_split_and_big_rule'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {
         'section_number' => '1.1'
       },
diff --git a/tp/t/results/html_tests/xhtml_rule_element_already_closed.pl 
b/tp/t/results/html_tests/xhtml_rule_element_already_closed.pl
index 9fed85941d..c4cad1241d 100644
--- a/tp/t/results/html_tests/xhtml_rule_element_already_closed.pl
+++ b/tp/t/results/html_tests/xhtml_rule_element_already_closed.pl
@@ -11,23 +11,28 @@ $result_trees{'xhtml_rule_element_already_closed'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'xhtml_rule_element_already_closed'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -77,23 +85,28 @@ $result_trees{'xhtml_rule_element_already_closed'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -108,23 +121,28 @@ $result_trees{'xhtml_rule_element_already_closed'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
diff --git a/tp/t/results/htmlxref/htmlxref.pl 
b/tp/t/results/htmlxref/htmlxref.pl
index a98791ab48..19b29c1342 100644
--- a/tp/t/results/htmlxref/htmlxref.pl
+++ b/tp/t/results/htmlxref/htmlxref.pl
@@ -31,23 +31,28 @@ $result_trees{'htmlxref'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'htmlxref'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Test refs'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Test refs'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1579,84 +1587,89 @@ $result_trees{'htmlxref'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'other nodes'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '!_"#$%&\'()*+-.'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '!_"#$%&\'()*+-.'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'other-nodes'
@@ -1672,24 +1685,27 @@ $result_trees{'htmlxref'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter with nodes'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter with nodes'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2109,85 +2125,88 @@ $result_trees{'htmlxref'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => '!_"#$%&\'()*+-.'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '/;<=>?[\\]^_`|~'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '!_"#$%&\'()*+-.'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '/;<=>?[\\]^_`|~'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'example',
           'contents' => [
@@ -2272,75 +2291,78 @@ $result_trees{'htmlxref'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => '/;<=>?[\\]^_`|~'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'local   node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '/;<=>?[\\]^_`|~'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'local-node'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => '!_"#$%&\'()*+-.'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'local   node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'local-node'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '!_"#$%&\'()*+-.'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'example',
           'contents' => [
@@ -2425,59 +2447,62 @@ $result_trees{'htmlxref'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'local   node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '/;<=>?[\\]^_`|~'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'local   node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '/;<=>?[\\]^_`|~'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'example',
           'contents' => [
@@ -2574,32 +2599,32 @@ $result_trees{'htmlxref'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'contents'}[0]{'contents'}[1];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'contents'}[0]{'contents'}[3];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[3]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref'}{'contents'}[3]{'args'}[1]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[3]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[5]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref'}{'contents'}[5]{'args'}[1]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[5]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref'}{'contents'}[5]{'args'}[2]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref'}{'contents'}[5]{'args'}[3]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[6]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref'}{'contents'}[6]{'args'}[1]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[6]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref'}{'contents'}[6]{'args'}[2]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[6]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref'}{'contents'}[6]{'args'}[3]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[7]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref'}{'contents'}[7]{'args'}[2]{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[7]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref'}{'contents'}[7]{'args'}[3]{'contents'}[0];
+$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'contents'}[0]{'contents'}[1];
+$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'contents'}[0]{'contents'}[3];
+$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[20]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[20]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[25]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[25]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[28]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[28]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[31]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[31]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[34]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[34]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'htmlxref'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'htmlxref'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'htmlxref'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref'}{'contents'}[6]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'htmlxref'}{'contents'}[6]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[6]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'htmlxref'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'htmlxref'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'htmlxref'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/htmlxref/htmlxref_no_urlprefix_first.pl 
b/tp/t/results/htmlxref/htmlxref_no_urlprefix_first.pl
index 913ac76f57..9431d38302 100644
--- a/tp/t/results/htmlxref/htmlxref_no_urlprefix_first.pl
+++ b/tp/t/results/htmlxref/htmlxref_no_urlprefix_first.pl
@@ -16,23 +16,28 @@ $result_trees{'htmlxref_no_urlprefix_first'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'htmlxref_no_urlprefix_first'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'htmlxref_no_urlprefix_first'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -113,24 +126,27 @@ $result_trees{'htmlxref_no_urlprefix_first'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/htmlxref/htmlxref_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_nodes.pl
index f8bd332e3e..cfe80aafca 100644
--- a/tp/t/results/htmlxref/htmlxref_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_nodes.pl
@@ -31,23 +31,28 @@ $result_trees{'htmlxref_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'htmlxref_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Test refs'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Test refs'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1579,84 +1587,89 @@ $result_trees{'htmlxref_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'other nodes'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '!_"#$%&\'()*+-.'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '!_"#$%&\'()*+-.'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'other-nodes'
@@ -1672,24 +1685,27 @@ $result_trees{'htmlxref_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter with nodes'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter with nodes'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2109,85 +2125,88 @@ $result_trees{'htmlxref_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => '!_"#$%&\'()*+-.'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '/;<=>?[\\]^_`|~'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '!_"#$%&\'()*+-.'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '/;<=>?[\\]^_`|~'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'example',
           'contents' => [
@@ -2272,75 +2291,78 @@ $result_trees{'htmlxref_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => '/;<=>?[\\]^_`|~'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'local   node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '/;<=>?[\\]^_`|~'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'local-node'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => '!_"#$%&\'()*+-.'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'local   node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'local-node'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '!_"#$%&\'()*+-.'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'example',
           'contents' => [
@@ -2425,59 +2447,62 @@ $result_trees{'htmlxref_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'local   node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '/;<=>?[\\]^_`|~'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'local   node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '/;<=>?[\\]^_`|~'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'example',
           'contents' => [
@@ -2574,32 +2599,32 @@ $result_trees{'htmlxref_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'contents'}[0]{'contents'}[1];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'contents'}[0]{'contents'}[3];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[3]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref_nodes'}{'contents'}[3]{'args'}[1]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[3]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref_nodes'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref_nodes'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[5]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref_nodes'}{'contents'}[5]{'args'}[1]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[5]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref_nodes'}{'contents'}[5]{'args'}[2]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref_nodes'}{'contents'}[5]{'args'}[3]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[6]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref_nodes'}{'contents'}[6]{'args'}[1]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[6]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref_nodes'}{'contents'}[6]{'args'}[2]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[6]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref_nodes'}{'contents'}[6]{'args'}[3]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[7]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref_nodes'}{'contents'}[7]{'args'}[2]{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[7]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref_nodes'}{'contents'}[7]{'args'}[3]{'contents'}[0];
+$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'contents'}[0]{'contents'}[1];
+$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'contents'}[0]{'contents'}[3];
+$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[20]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[20]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[25]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[25]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[28]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[28]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[31]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[31]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[34]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[34]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'htmlxref_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'htmlxref_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'htmlxref_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'htmlxref_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'htmlxref_nodes'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'htmlxref_nodes'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'htmlxref_nodes'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono.pl 
b/tp/t/results/htmlxref/htmlxref_only_mono.pl
index 744f16e594..20a5ff671e 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono.pl
@@ -31,23 +31,28 @@ $result_trees{'htmlxref_only_mono'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'htmlxref_only_mono'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Test refs'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Test refs'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1579,84 +1587,89 @@ $result_trees{'htmlxref_only_mono'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'other nodes'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '!_"#$%&\'()*+-.'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '!_"#$%&\'()*+-.'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'other-nodes'
@@ -1672,24 +1685,27 @@ $result_trees{'htmlxref_only_mono'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter with nodes'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter with nodes'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2109,85 +2125,88 @@ $result_trees{'htmlxref_only_mono'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => '!_"#$%&\'()*+-.'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '/;<=>?[\\]^_`|~'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '!_"#$%&\'()*+-.'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '/;<=>?[\\]^_`|~'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'example',
           'contents' => [
@@ -2272,75 +2291,78 @@ $result_trees{'htmlxref_only_mono'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => '/;<=>?[\\]^_`|~'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'local   node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '/;<=>?[\\]^_`|~'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'local-node'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => '!_"#$%&\'()*+-.'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'local   node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'local-node'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '!_"#$%&\'()*+-.'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'example',
           'contents' => [
@@ -2425,59 +2447,62 @@ $result_trees{'htmlxref_only_mono'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'local   node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '/;<=>?[\\]^_`|~'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'local   node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '/;<=>?[\\]^_`|~'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'example',
           'contents' => [
@@ -2574,32 +2599,32 @@ $result_trees{'htmlxref_only_mono'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'contents'}[0]{'contents'}[1];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'contents'}[0]{'contents'}[3];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[3]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref_only_mono'}{'contents'}[3]{'args'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[3]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref_only_mono'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref_only_mono'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[5]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref_only_mono'}{'contents'}[5]{'args'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[5]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref_only_mono'}{'contents'}[5]{'args'}[2]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref_only_mono'}{'contents'}[5]{'args'}[3]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[6]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref_only_mono'}{'contents'}[6]{'args'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[6]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref_only_mono'}{'contents'}[6]{'args'}[2]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[6]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref_only_mono'}{'contents'}[6]{'args'}[3]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[7]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref_only_mono'}{'contents'}[7]{'args'}[2]{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[7]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'htmlxref_only_mono'}{'contents'}[7]{'args'}[3]{'contents'}[0];
+$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'contents'}[0]{'contents'}[1];
+$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'contents'}[0]{'contents'}[3];
+$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[20]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[20]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[25]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[25]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[28]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[28]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[31]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[31]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[34]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[34]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_mono'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_mono'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'htmlxref_only_mono'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_mono'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_mono'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'htmlxref_only_mono'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'htmlxref_only_mono'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_mono'}{'contents'}[6]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'htmlxref_only_mono'}{'contents'}[6]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[6]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'htmlxref_only_mono'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'htmlxref_only_mono'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'htmlxref_only_mono'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
index c0044e2a6f..60d12a063b 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
@@ -31,23 +31,28 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Test refs'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Test refs'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1579,84 +1587,89 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'other nodes'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '!_"#$%&\'()*+-.'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '!_"#$%&\'()*+-.'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'other-nodes'
@@ -1672,24 +1685,27 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter with nodes'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter with nodes'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2109,85 +2125,88 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => '!_"#$%&\'()*+-.'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '/;<=>?[\\]^_`|~'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '!_"#$%&\'()*+-.'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '/;<=>?[\\]^_`|~'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'example',
           'contents' => [
@@ -2272,75 +2291,78 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => '/;<=>?[\\]^_`|~'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'local   node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '/;<=>?[\\]^_`|~'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'local-node'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => '!_"#$%&\'()*+-.'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'local   node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'local-node'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '!_"#$%&\'()*+-.'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'example',
           'contents' => [
@@ -2425,59 +2447,62 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'local   node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '/;<=>?[\\]^_`|~'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'local   node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '/;<=>?[\\]^_`|~'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'example',
           'contents' => [
@@ -2574,32 +2599,32 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'contents'}[0]{'contents'}[1];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'contents'}[0]{'contents'}[3];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[3]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[3]{'args'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[3]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[5]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[5]{'args'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[5]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[5]{'args'}[2]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[5]{'args'}[3]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[6]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[6]{'args'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[6]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[6]{'args'}[2]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[6]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[6]{'args'}[3]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[7]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[7]{'args'}[2]{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[7]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[7]{'args'}[3]{'contents'}[0];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'contents'}[0]{'contents'}[1];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'contents'}[0]{'contents'}[3];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[20]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[20]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[25]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[25]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[28]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[28]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[31]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[31]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[34]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[34]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'htmlxref_only_mono_nodes'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/htmlxref/htmlxref_only_split.pl 
b/tp/t/results/htmlxref/htmlxref_only_split.pl
index 737cb2597c..56765a83e6 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split.pl
@@ -31,23 +31,28 @@ $result_trees{'htmlxref_only_split'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'htmlxref_only_split'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Test refs'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Test refs'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1579,84 +1587,89 @@ $result_trees{'htmlxref_only_split'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'other nodes'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '!_"#$%&\'()*+-.'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '!_"#$%&\'()*+-.'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'other-nodes'
@@ -1672,24 +1685,27 @@ $result_trees{'htmlxref_only_split'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter with nodes'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter with nodes'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2109,85 +2125,88 @@ $result_trees{'htmlxref_only_split'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => '!_"#$%&\'()*+-.'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '/;<=>?[\\]^_`|~'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '!_"#$%&\'()*+-.'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '/;<=>?[\\]^_`|~'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'example',
           'contents' => [
@@ -2272,75 +2291,78 @@ $result_trees{'htmlxref_only_split'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => '/;<=>?[\\]^_`|~'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'local   node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '/;<=>?[\\]^_`|~'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'local-node'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => '!_"#$%&\'()*+-.'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'local   node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'local-node'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '!_"#$%&\'()*+-.'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'example',
           'contents' => [
@@ -2425,59 +2447,62 @@ $result_trees{'htmlxref_only_split'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'local   node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '/;<=>?[\\]^_`|~'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'local   node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '/;<=>?[\\]^_`|~'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'example',
           'contents' => [
@@ -2574,32 +2599,32 @@ $result_trees{'htmlxref_only_split'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'contents'}[0]{'contents'}[1];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'contents'}[0]{'contents'}[3];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[3]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[3]{'args'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[3]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[5]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[5]{'args'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[5]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[5]{'args'}[2]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[5]{'args'}[3]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[6]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[6]{'args'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[6]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[6]{'args'}[2]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[6]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[6]{'args'}[3]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[7]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[7]{'args'}[2]{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[7]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[7]{'args'}[3]{'contents'}[0];
+$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'contents'}[0]{'contents'}[1];
+$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'contents'}[0]{'contents'}[3];
+$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[20]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[20]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[25]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[25]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[28]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[28]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[31]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[31]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[34]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[34]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_split'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_split'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'htmlxref_only_split'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_split'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_split'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'htmlxref_only_split'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'htmlxref_only_split'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_split'}{'contents'}[6]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'htmlxref_only_split'}{'contents'}[6]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[6]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'htmlxref_only_split'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'htmlxref_only_split'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'htmlxref_only_split'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
index b7b3c7e9fa..d072eb54ad 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
@@ -31,23 +31,28 @@ $result_trees{'htmlxref_only_split_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'htmlxref_only_split_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Test refs'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Test refs'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1579,84 +1587,89 @@ $result_trees{'htmlxref_only_split_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'other nodes'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '!_"#$%&\'()*+-.'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '!_"#$%&\'()*+-.'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'other-nodes'
@@ -1672,24 +1685,27 @@ $result_trees{'htmlxref_only_split_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter with nodes'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter with nodes'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2109,85 +2125,88 @@ $result_trees{'htmlxref_only_split_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => '!_"#$%&\'()*+-.'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '/;<=>?[\\]^_`|~'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '!_"#$%&\'()*+-.'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '/;<=>?[\\]^_`|~'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'example',
           'contents' => [
@@ -2272,75 +2291,78 @@ $result_trees{'htmlxref_only_split_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => '/;<=>?[\\]^_`|~'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'local   node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '/;<=>?[\\]^_`|~'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'local-node'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => '!_"#$%&\'()*+-.'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'local   node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'local-node'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '!_"#$%&\'()*+-.'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'example',
           'contents' => [
@@ -2425,59 +2447,62 @@ $result_trees{'htmlxref_only_split_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'local   node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '/;<=>?[\\]^_`|~'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'local   node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '/;<=>?[\\]^_`|~'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'example',
           'contents' => [
@@ -2574,32 +2599,32 @@ $result_trees{'htmlxref_only_split_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'contents'}[0]{'contents'}[1];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[2]{'contents'}[0]{'contents'}[3];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[19]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[30]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[3]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[3]{'args'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[3]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[5]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[5]{'args'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[5]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[5]{'args'}[2]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[5]{'args'}[3]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[6]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[6]{'args'}[1]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[6]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[6]{'args'}[2]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[6]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[6]{'args'}[3]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[7]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[7]{'args'}[2]{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[7]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[7]{'args'}[3]{'contents'}[0];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'contents'}[0]{'contents'}[1];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[2]{'contents'}[0]{'contents'}[3];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[20]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[20]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[25]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[25]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[28]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[28]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[31]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[31]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[34]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[34]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'htmlxref_only_split_nodes'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'htmlxref_only_split_nodes'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/include/cpp_line_latin1.pl 
b/tp/t/results/include/cpp_line_latin1.pl
index 0101df11ed..62f3b2c34c 100644
--- a/tp/t/results/include/cpp_line_latin1.pl
+++ b/tp/t/results/include/cpp_line_latin1.pl
@@ -70,23 +70,28 @@ $result_trees{'cpp_line_latin1'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -102,19 +107,22 @@ $result_trees{'cpp_line_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -128,24 +136,27 @@ $result_trees{'cpp_line_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/include/cpp_lines.pl 
b/tp/t/results/include/cpp_lines.pl
index ac2835a0f0..782946ac31 100644
--- a/tp/t/results/include/cpp_lines.pl
+++ b/tp/t/results/include/cpp_lines.pl
@@ -105,23 +105,28 @@ $result_trees{'cpp_lines'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -137,24 +142,27 @@ $result_trees{'cpp_lines'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 5be3f3379e..7e478a3ac3 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
@@ -333,23 +333,28 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -364,24 +369,27 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -399,24 +407,27 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'source_marks' => [
             {
diff --git a/tp/t/results/include/macro_in_early_commands.pl 
b/tp/t/results/include/macro_in_early_commands.pl
index 8526f2d431..e783a9eae8 100644
--- a/tp/t/results/include/macro_in_early_commands.pl
+++ b/tp/t/results/include/macro_in_early_commands.pl
@@ -495,23 +495,28 @@ $result_trees{'macro_in_early_commands'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -526,24 +531,27 @@ $result_trees{'macro_in_early_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -561,24 +569,27 @@ $result_trees{'macro_in_early_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'source_marks' => [
             {
diff --git a/tp/t/results/include/value_expansion_in_include.pl 
b/tp/t/results/include/value_expansion_in_include.pl
index 51b87a5ae9..62ffc86b9f 100644
--- a/tp/t/results/include/value_expansion_in_include.pl
+++ b/tp/t/results/include/value_expansion_in_include.pl
@@ -104,23 +104,28 @@ $result_trees{'value_expansion_in_include'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -135,24 +140,27 @@ $result_trees{'value_expansion_in_include'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/indices/complex_recursive_synindex.pl 
b/tp/t/results/indices/complex_recursive_synindex.pl
index 54e4b7ab38..a998c5237e 100644
--- a/tp/t/results/indices/complex_recursive_synindex.pl
+++ b/tp/t/results/indices/complex_recursive_synindex.pl
@@ -11,23 +11,28 @@ $result_trees{'complex_recursive_synindex'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'complex_recursive_synindex'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -895,12 +903,12 @@ $result_trees{'complex_recursive_synindex'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[17]{'extra'}{'element_node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[2];
+$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[2];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[18]{'extra'}{'element_node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[2];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[19]{'extra'}{'element_node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[2];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[2]{'contents'}[20]{'extra'}{'element_node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[2];
 
$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'}[22]{'extra'}{'element_node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[2];
 
 $result_texis{'complex_recursive_synindex'} = '@node Top
 @node chap
diff --git a/tp/t/results/indices/def_syn_indices.pl 
b/tp/t/results/indices/def_syn_indices.pl
index 5366555e59..788492d4fd 100644
--- a/tp/t/results/indices/def_syn_indices.pl
+++ b/tp/t/results/indices/def_syn_indices.pl
@@ -56,23 +56,28 @@ $result_trees{'def_syn_indices'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -87,24 +92,27 @@ $result_trees{'def_syn_indices'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -122,23 +130,28 @@ $result_trees{'def_syn_indices'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -154,24 +167,27 @@ $result_trees{'def_syn_indices'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1254,13 +1270,13 @@ $result_trees{'def_syn_indices'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[7]{'extra'}{'element_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
-$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
-$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[14]{'extra'}{'element_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
-$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[24]{'extra'}{'element_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
-$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[26]{'extra'}{'element_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[15]{'extra'}{'element_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[25]{'extra'}{'element_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[27]{'extra'}{'element_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
 
 $result_texis{'def_syn_indices'} = '@syncodeindex cp fn
 
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 15f91c9409..6e693471a7 100644
Binary files 
a/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl and 
b/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl differ
diff --git a/tp/t/results/indices/double_index_entry.pl 
b/tp/t/results/indices/double_index_entry.pl
index b35f857f0d..6d1471682e 100644
--- a/tp/t/results/indices/double_index_entry.pl
+++ b/tp/t/results/indices/double_index_entry.pl
@@ -16,24 +16,27 @@ $result_trees{'double_index_entry'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -253,46 +256,49 @@ $result_trees{'double_index_entry'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chap other node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chap other node'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -389,11 +395,11 @@ $result_trees{'double_index_entry'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'double_index_entry'}{'contents'}[1];
-$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'double_index_entry'}{'contents'}[1];
-$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_index_entry'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'double_index_entry'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'double_index_entry'}{'contents'}[2];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'double_index_entry'}{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'double_index_entry'}{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'double_index_entry'}{'contents'}[2];
 
 $result_texis{'double_index_entry'} = '@node Top
 
diff --git a/tp/t/results/indices/double_seeentry_seealso.pl 
b/tp/t/results/indices/double_seeentry_seealso.pl
index 063caae518..c8eb2e465b 100644
--- a/tp/t/results/indices/double_seeentry_seealso.pl
+++ b/tp/t/results/indices/double_seeentry_seealso.pl
@@ -16,23 +16,28 @@ $result_trees{'double_seeentry_seealso'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'double_seeentry_seealso'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'double_seeentry_seealso'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -114,24 +127,27 @@ $result_trees{'double_seeentry_seealso'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter Index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter Index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -524,18 +540,18 @@ $result_trees{'double_seeentry_seealso'} = {
   ],
   'type' => 'document_root'
 };
-$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'}{'seeentry'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[4];
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[3];
-$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'extra'}{'seealso'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[4];
+$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'extra'}{'seeentry'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[4];
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[3];
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'extra'}{'seealso'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[4];
-$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'extra'}{'seeentry'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[2];
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[3];
-$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'extra'}{'seealso'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'}{'args'}[0]{'contents'}[2]
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'extra'}{'seeentry'};
-$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4];
-$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[5] = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'};
+$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'extra'}{'seealso'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[4];
+$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'extra'}{'seeentry'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[2];
+$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[3];
+$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[5]{'extra'}{'seealso'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0];
+$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[5]{'extra'}{'subentry'}{'args'}[0]{'contents'}[2]
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[5]{'extra'}{'seeentry'};
+$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[5]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[5];
+$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[6] = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[5]{'extra'}{'subentry'};
 
 $result_texis{'double_seeentry_seealso'} = '@node top
 @top top
diff --git a/tp/t/results/indices/double_syncodeindex.pl 
b/tp/t/results/indices/double_syncodeindex.pl
index 4415d0510e..4d0da5cf3b 100644
--- a/tp/t/results/indices/double_syncodeindex.pl
+++ b/tp/t/results/indices/double_syncodeindex.pl
@@ -89,23 +89,28 @@ $result_trees{'double_syncodeindex'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -120,24 +125,27 @@ $result_trees{'double_syncodeindex'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -302,8 +310,8 @@ $result_trees{'double_syncodeindex'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_syncodeindex'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'double_syncodeindex'}{'contents'}[2];
 
$result_trees{'double_syncodeindex'}{'contents'}[2]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'double_syncodeindex'}{'contents'}[2];
+$result_trees{'double_syncodeindex'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'double_syncodeindex'}{'contents'}[2];
 
 $result_texis{'double_syncodeindex'} = '@syncodeindex cp fn
 @syncodeindex cp fn
diff --git a/tp/t/results/indices/empty_added_index_entry.pl 
b/tp/t/results/indices/empty_added_index_entry.pl
index b91f7967af..0ef9ddb820 100644
--- a/tp/t/results/indices/empty_added_index_entry.pl
+++ b/tp/t/results/indices/empty_added_index_entry.pl
@@ -55,23 +55,28 @@ $result_trees{'empty_added_index_entry'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -86,24 +91,27 @@ $result_trees{'empty_added_index_entry'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/indices/empty_cindex_entry.pl 
b/tp/t/results/indices/empty_cindex_entry.pl
index 190d2d2684..f4edbb9b9a 100644
--- a/tp/t/results/indices/empty_cindex_entry.pl
+++ b/tp/t/results/indices/empty_cindex_entry.pl
@@ -16,23 +16,28 @@ $result_trees{'empty_cindex_entry'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'empty_cindex_entry'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
diff --git a/tp/t/results/indices/empty_index_entry.pl 
b/tp/t/results/indices/empty_index_entry.pl
index ae4e1ef8c5..75a211a63a 100644
--- a/tp/t/results/indices/empty_index_entry.pl
+++ b/tp/t/results/indices/empty_index_entry.pl
@@ -16,24 +16,27 @@ $result_trees{'empty_index_entry'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -54,24 +57,27 @@ $result_trees{'empty_index_entry'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/indices/empty_string_index_entry.pl 
b/tp/t/results/indices/empty_string_index_entry.pl
index 991499f989..64f1d628d3 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -16,23 +16,28 @@ $result_trees{'empty_string_index_entry'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'empty_string_index_entry'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -593,11 +601,11 @@ $result_trees{'empty_string_index_entry'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2];
-$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'empty_string_index_entry'}{'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'}[2]{'extra'}{'element_node'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2];
+$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2];
+$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2];
+$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2];
 
 $result_texis{'empty_string_index_entry'} = '@node Top
 @node chap
diff --git a/tp/t/results/indices/encoding_index_ascii.pl 
b/tp/t/results/indices/encoding_index_ascii.pl
index 0c6c541763..ad58fc9559 100644
--- a/tp/t/results/indices/encoding_index_ascii.pl
+++ b/tp/t/results/indices/encoding_index_ascii.pl
@@ -99,23 +99,28 @@ $result_trees{'encoding_index_ascii'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -130,23 +135,28 @@ $result_trees{'encoding_index_ascii'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'top',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
@@ -158,24 +168,27 @@ $result_trees{'encoding_index_ascii'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2672,7 +2685,6 @@ $result_trees{'encoding_index_ascii'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[2]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
@@ -2729,6 +2741,7 @@ 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[54]{'extra'}{'e
 
$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'}[56]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[57]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[3]{'contents'}[58]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[3];
 
 $result_texis{'encoding_index_ascii'} = '
 @setfilename encoding_index_ascii.info
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 7d2f8b3344..546cb7ba31 100644
--- a/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
@@ -99,23 +99,28 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -130,23 +135,28 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'top',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
@@ -158,24 +168,27 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2672,7 +2685,6 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[2]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
@@ -2729,6 +2741,7 @@ 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}
 
$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'}[56]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[57]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3]{'contents'}[58]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[3];
 
 $result_texis{'encoding_index_ascii_enable_encoding'} = '
 @setfilename encoding_index_ascii_enable_encoding.info
diff --git a/tp/t/results/indices/encoding_index_latin1.pl 
b/tp/t/results/indices/encoding_index_latin1.pl
index 88a93fea5f..222e37ae5f 100644
--- a/tp/t/results/indices/encoding_index_latin1.pl
+++ b/tp/t/results/indices/encoding_index_latin1.pl
@@ -65,23 +65,28 @@ $result_trees{'encoding_index_latin1'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -97,24 +102,27 @@ $result_trees{'encoding_index_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'encoding index latin1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'encoding index latin1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -133,24 +141,27 @@ $result_trees{'encoding_index_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2621,7 +2632,6 @@ $result_trees{'encoding_index_latin1'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[2]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
@@ -2676,6 +2686,7 @@ 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[52]{'extra'}{'
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[53]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1'}{'contents'}[3]{'contents'}[54]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
$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'}[56]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[3];
 
 $result_texis{'encoding_index_latin1'} = '
 @documentencoding iso-8859-1
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 97205de808..0f229d9b78 100644
--- a/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
@@ -65,23 +65,28 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -97,24 +102,27 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'encoding index latin1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'encoding index latin1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -133,24 +141,27 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2621,7 +2632,6 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[2]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
@@ -2676,6 +2686,7 @@ 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[53]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3]{'contents'}[54]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
$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'}[56]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[3];
 
 $result_texis{'encoding_index_latin1_enable_encoding'} = '
 @documentencoding iso-8859-1
diff --git a/tp/t/results/indices/encoding_index_utf8.pl 
b/tp/t/results/indices/encoding_index_utf8.pl
index 97ac0bb176..a773188848 100644
--- a/tp/t/results/indices/encoding_index_utf8.pl
+++ b/tp/t/results/indices/encoding_index_utf8.pl
@@ -65,23 +65,28 @@ $result_trees{'encoding_index_utf8'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -97,24 +102,27 @@ $result_trees{'encoding_index_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'encoding index utf8'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'encoding index utf8'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -133,24 +141,27 @@ $result_trees{'encoding_index_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2621,7 +2632,6 @@ $result_trees{'encoding_index_utf8'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[2]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
@@ -2676,6 +2686,7 @@ 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[52]{'extra'}{'el
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[53]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8'}{'contents'}[3]{'contents'}[54]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
$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'}[56]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[3];
 
 $result_texis{'encoding_index_utf8'} = '
 @documentencoding utf-8
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 8ed3cef24f..253ef8aa4f 100644
--- a/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
@@ -65,23 +65,28 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -97,24 +102,27 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'encoding index utf8'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'encoding index utf8'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -133,24 +141,27 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2621,7 +2632,6 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[2]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
@@ -2676,6 +2686,7 @@ 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[53]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3]{'contents'}[54]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
$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'}[56]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[3];
 
 $result_texis{'encoding_index_utf8_enable_encoding'} = '
 @documentencoding utf-8
diff --git a/tp/t/results/indices/encoding_index_utf8_no_use_unicode.pl 
b/tp/t/results/indices/encoding_index_utf8_no_use_unicode.pl
index 21cb36c181..01e4852e32 100644
--- a/tp/t/results/indices/encoding_index_utf8_no_use_unicode.pl
+++ b/tp/t/results/indices/encoding_index_utf8_no_use_unicode.pl
@@ -65,23 +65,28 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -97,24 +102,27 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'encoding index utf8'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'encoding index utf8'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -133,24 +141,27 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2621,7 +2632,6 @@ $result_trees{'encoding_index_utf8_no_use_unicode'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'encoding_index_utf8_no_use_unicode'}{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_no_use_unicode'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_no_use_unicode'}{'contents'}[3]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_no_use_unicode'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_no_use_unicode'}{'contents'}[3]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_no_use_unicode'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_no_use_unicode'}{'contents'}[3]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_no_use_unicode'}{'contents'}[3];
@@ -2676,6 +2686,7 @@ 
$result_trees{'encoding_index_utf8_no_use_unicode'}{'contents'}[3]{'contents'}[5
 
$result_trees{'encoding_index_utf8_no_use_unicode'}{'contents'}[3]{'contents'}[53]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_no_use_unicode'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_no_use_unicode'}{'contents'}[3]{'contents'}[54]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_no_use_unicode'}{'contents'}[3];
 
$result_trees{'encoding_index_utf8_no_use_unicode'}{'contents'}[3]{'contents'}[55]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_no_use_unicode'}{'contents'}[3];
+$result_trees{'encoding_index_utf8_no_use_unicode'}{'contents'}[3]{'contents'}[56]{'extra'}{'element_node'}
 = $result_trees{'encoding_index_utf8_no_use_unicode'}{'contents'}[3];
 
 $result_texis{'encoding_index_utf8_no_use_unicode'} = '
 @documentencoding utf-8
diff --git a/tp/t/results/indices/explicit_sort_key.pl 
b/tp/t/results/indices/explicit_sort_key.pl
index 65cb9be12e..0aa3a9fa31 100644
--- a/tp/t/results/indices/explicit_sort_key.pl
+++ b/tp/t/results/indices/explicit_sort_key.pl
@@ -16,23 +16,28 @@ $result_trees{'explicit_sort_key'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,19 +52,22 @@ $result_trees{'explicit_sort_key'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -72,24 +80,27 @@ $result_trees{'explicit_sort_key'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -573,10 +584,10 @@ $result_trees{'explicit_sort_key'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[4]{'extra'}{'element_node'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3];
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3];
 
$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'}[7]{'extra'}{'element_node'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3];
 
 $result_texis{'explicit_sort_key'} = '@node Top
 @top
diff --git a/tp/t/results/indices/ftable_vtable.pl 
b/tp/t/results/indices/ftable_vtable.pl
index f9cb936d94..eeaea36962 100644
--- a/tp/t/results/indices/ftable_vtable.pl
+++ b/tp/t/results/indices/ftable_vtable.pl
@@ -26,23 +26,28 @@ $result_trees{'ftable_vtable'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -57,24 +62,27 @@ $result_trees{'ftable_vtable'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -642,15 +650,15 @@ $result_trees{'ftable_vtable'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[2];
-$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[2];
-$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[2];
-$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[2];
-$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[2];
-$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[2];
-$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[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'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[2];
+$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[2];
+$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[2];
+$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[2];
+$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[2];
+$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[2];
+$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[2];
 
 $result_texis{'ftable_vtable'} = '
 @node Top
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 033463c85b..9e1cd8026b 100644
--- a/tp/t/results/indices/ignored_sort_char_empty_entries.pl
+++ b/tp/t/results/indices/ignored_sort_char_empty_entries.pl
@@ -40,23 +40,28 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -71,19 +76,22 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -96,24 +104,27 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -343,10 +354,10 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[2]{'extra'}{'element_node'}
 = $result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3];
 
$result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'ignored_sort_char_empty_entries'}{'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'}[5]{'extra'}{'element_node'}
 = $result_trees{'ignored_sort_char_empty_entries'}{'contents'}[3];
 
 $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 76780fab8a..692a791a4d 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 693854229c..49f1eff2f4 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 880c587d21..98dbaf10ef 100644
--- a/tp/t/results/indices/index_and_node_same_name.pl
+++ b/tp/t/results/indices/index_and_node_same_name.pl
@@ -16,23 +16,28 @@ $result_trees{'index_and_node_same_name'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'index_and_node_same_name'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Test index entry with node name clash'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Test index entry with node name clash'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -137,23 +145,28 @@ $result_trees{'index_and_node_same_name'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'index node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'index node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -169,24 +182,27 @@ $result_trees{'index_and_node_same_name'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'index node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'index node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -254,7 +270,7 @@ $result_trees{'index_and_node_same_name'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_and_node_same_name'}{'contents'}[1];
 
 $result_texis{'index_and_node_same_name'} = '@node Top
 @top Test index entry with node name clash
diff --git a/tp/t/results/indices/index_entries_before_nodes.pl 
b/tp/t/results/indices/index_entries_before_nodes.pl
index 79618d6cad..c8f4d49c6e 100644
Binary files a/tp/t/results/indices/index_entries_before_nodes.pl and 
b/tp/t/results/indices/index_entries_before_nodes.pl differ
diff --git a/tp/t/results/indices/index_entries_locations.pl 
b/tp/t/results/indices/index_entries_locations.pl
index 2ca2c93153..875495e359 100644
--- a/tp/t/results/indices/index_entries_locations.pl
+++ b/tp/t/results/indices/index_entries_locations.pl
@@ -26,23 +26,28 @@ $result_trees{'index_entries_locations'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -57,24 +62,27 @@ $result_trees{'index_entries_locations'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -353,10 +361,10 @@ $result_trees{'index_entries_locations'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_entries_locations'}{'contents'}[2];
-$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_entries_locations'}{'contents'}[2];
-$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'index_entries_locations'}{'contents'}[2];
-$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'index_entries_locations'}{'contents'}[2];
+$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_entries_locations'}{'contents'}[2];
+$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_entries_locations'}{'contents'}[2];
+$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'index_entries_locations'}{'contents'}[2];
+$result_trees{'index_entries_locations'}{'contents'}[2]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'index_entries_locations'}{'contents'}[2];
 
 $result_texis{'index_entries_locations'} = '
 @node Top
diff --git a/tp/t/results/indices/index_entry_before_first_node.pl 
b/tp/t/results/indices/index_entry_before_first_node.pl
index 3f4ac4dea2..ca42f36905 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 5b64b2b4a0..d82e80e04d 100644
--- a/tp/t/results/indices/index_entry_before_node.pl
+++ b/tp/t/results/indices/index_entry_before_node.pl
@@ -16,24 +16,27 @@ $result_trees{'index_entry_before_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -203,59 +206,62 @@ $result_trees{'index_entry_before_node'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chap first'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chap first'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'second'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'second'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'second'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -331,59 +337,62 @@ $result_trees{'index_entry_before_node'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'second'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap first'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'second'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'chap-first'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chap first'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'chap-first'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -439,13 +448,13 @@ $result_trees{'index_entry_before_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_entry_before_node'}{'contents'}[2]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'args'}[1]{'contents'}[0];
-$result_trees{'index_entry_before_node'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_entry_before_node'}{'contents'}[2];
-$result_trees{'index_entry_before_node'}{'contents'}[3]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'index_entry_before_node'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[3]{'args'}[3]{'contents'}[0];
+$result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_entry_before_node'}{'contents'}[2];
+$result_trees{'index_entry_before_node'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'index_entry_before_node'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'index_entry_before_node'} = '@node Top
 
diff --git a/tp/t/results/indices/index_entry_in_footnote.pl 
b/tp/t/results/indices/index_entry_in_footnote.pl
index 10aa2736b2..cd3efa3324 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 b8a524ff72..e0bdb8b5ed 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
@@ -16,24 +16,27 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -203,24 +206,27 @@ 
$result_trees{'index_entry_in_footnote_different_node_end'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -386,24 +392,27 @@ 
$result_trees{'index_entry_in_footnote_different_node_end'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'First'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'First'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -459,10 +468,10 @@ 
$result_trees{'index_entry_in_footnote_different_node_end'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[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]{'contents'}[0]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2];
+$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[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'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[2];
 
 $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 f450cdde45..59a8d31e7e 100644
--- a/tp/t/results/indices/index_entry_in_footnote_sections.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_sections.pl
@@ -16,23 +16,28 @@ $result_trees{'index_entry_in_footnote_sections'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'index_entry_in_footnote_sections'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'index_entry_in_footnote'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'index_entry_in_footnote'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -172,23 +180,28 @@ $result_trees{'index_entry_in_footnote_sections'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -204,24 +217,27 @@ $result_trees{'index_entry_in_footnote_sections'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -275,7 +291,7 @@ $result_trees{'index_entry_in_footnote_sections'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_entry_in_footnote_sections'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_entry_in_footnote_sections'}{'contents'}[1];
+$result_trees{'index_entry_in_footnote_sections'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_entry_in_footnote_sections'}{'contents'}[1];
 
 $result_texis{'index_entry_in_footnote_sections'} = '@node Top
 @top index_entry_in_footnote
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 d22be14aad..f7b94ff7b5 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
@@ -16,23 +16,28 @@ $result_trees{'index_entry_in_footnote_sections_separate'} 
= {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'index_entry_in_footnote_sections_separate'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'index_entry_in_footnote'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'index_entry_in_footnote'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -172,23 +180,28 @@ 
$result_trees{'index_entry_in_footnote_sections_separate'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -204,24 +217,27 @@ 
$result_trees{'index_entry_in_footnote_sections_separate'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -275,7 +291,7 @@ $result_trees{'index_entry_in_footnote_sections_separate'} 
= {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[1];
+$result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_entry_in_footnote_sections_separate'}{'contents'}[1];
 
 $result_texis{'index_entry_in_footnote_sections_separate'} = '@node Top
 @top index_entry_in_footnote
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 0d1d182df6..b0c32d76e2 100644
--- a/tp/t/results/indices/index_entry_in_footnote_separate.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_separate.pl
@@ -50,24 +50,27 @@ $result_trees{'index_entry_in_footnote_separate'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -237,24 +240,27 @@ $result_trees{'index_entry_in_footnote_separate'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -420,24 +426,27 @@ $result_trees{'index_entry_in_footnote_separate'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'First'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'First'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -493,10 +502,10 @@ $result_trees{'index_entry_in_footnote_separate'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_entry_in_footnote_separate'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[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]{'contents'}[0]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'index_entry_in_footnote_separate'}{'contents'}[2];
+$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_entry_in_footnote_separate'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[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'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'index_entry_in_footnote_separate'}{'contents'}[2];
 
 $result_texis{'index_entry_in_footnote_separate'} = '@footnotestyle separate
 @node Top
diff --git a/tp/t/results/indices/index_no_node.pl 
b/tp/t/results/indices/index_no_node.pl
index 24b5b3d3ff..25a8027fe3 100644
--- a/tp/t/results/indices/index_no_node.pl
+++ b/tp/t/results/indices/index_no_node.pl
@@ -162,24 +162,27 @@ $result_trees{'index_no_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -351,24 +354,27 @@ $result_trees{'index_no_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -701,24 +707,27 @@ $result_trees{'index_no_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'second'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -889,24 +898,27 @@ $result_trees{'index_no_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -1046,24 +1058,27 @@ $result_trees{'index_no_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/indices/index_no_node_no_top.pl 
b/tp/t/results/indices/index_no_node_no_top.pl
index 2f75a8d90d..40a9d376ab 100644
--- a/tp/t/results/indices/index_no_node_no_top.pl
+++ b/tp/t/results/indices/index_no_node_no_top.pl
@@ -119,24 +119,27 @@ $result_trees{'index_no_node_no_top'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -308,24 +311,27 @@ $result_trees{'index_no_node_no_top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top (chapter) section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top (chapter) section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -658,24 +664,27 @@ $result_trees{'index_no_node_no_top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'second'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -846,24 +855,27 @@ $result_trees{'index_no_node_no_top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -1003,24 +1015,27 @@ $result_trees{'index_no_node_no_top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/indices/index_no_node_no_top_no_node.pl 
b/tp/t/results/indices/index_no_node_no_top_no_node.pl
index 9b089efbea..0007ae4395 100644
--- a/tp/t/results/indices/index_no_node_no_top_no_node.pl
+++ b/tp/t/results/indices/index_no_node_no_top_no_node.pl
@@ -119,24 +119,27 @@ $result_trees{'index_no_node_no_top_no_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -308,24 +311,27 @@ $result_trees{'index_no_node_no_top_no_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top (chapter) section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top (chapter) section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -658,24 +664,27 @@ $result_trees{'index_no_node_no_top_no_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'second'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -846,24 +855,27 @@ $result_trees{'index_no_node_no_top_no_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -1003,24 +1015,27 @@ $result_trees{'index_no_node_no_top_no_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/indices/index_nodes.pl 
b/tp/t/results/indices/index_nodes.pl
index 3ebe3cfaee..d21a2b9885 100644
--- a/tp/t/results/indices/index_nodes.pl
+++ b/tp/t/results/indices/index_nodes.pl
@@ -31,24 +31,27 @@ $result_trees{'index_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -342,62 +345,65 @@ $result_trees{'index_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chap first'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chap first'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -721,46 +727,49 @@ $result_trees{'index_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'second'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap first'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'second'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'chap-first'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'chap first'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'chap-first'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'menu',
           'contents' => [
@@ -969,72 +978,75 @@ $result_trees{'index_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'another'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'a node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'another'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'a-node'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'a node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'a-node'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'second'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'second'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'second'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1172,69 +1184,72 @@ $result_trees{'index_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'a node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'another'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'a node'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'another'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'another'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'another'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'second'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'second'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'second'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -1461,28 +1476,28 @@ $result_trees{'index_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[1];
-$result_trees{'index_nodes'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_nodes'}{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'index_nodes'}{'contents'}[2]{'args'}[2]{'contents'}[0];
-$result_trees{'index_nodes'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'index_nodes'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[2];
-$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[2];
-$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[2];
-$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[2];
-$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_nodes'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'index_nodes'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-$result_trees{'index_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_nodes'}{'contents'}[4]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'index_nodes'}{'contents'}[4]{'args'}[2]{'contents'}[0];
-$result_trees{'index_nodes'}{'contents'}[4]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'index_nodes'}{'contents'}[4]{'args'}[3]{'contents'}[0];
-$result_trees{'index_nodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[4];
+$result_trees{'index_nodes'}{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[1];
+$result_trees{'index_nodes'}{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes'}{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[2];
+$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[2];
+$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[2];
+$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[2];
+$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'index_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'index_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'index_nodes'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[4];
 
$result_trees{'index_nodes'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[4];
-$result_trees{'index_nodes'}{'contents'}[5]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'index_nodes'}{'contents'}[5]{'args'}[1]{'contents'}[0];
-$result_trees{'index_nodes'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'index_nodes'}{'contents'}[5]{'args'}[3]{'contents'}[0];
-$result_trees{'index_nodes'}{'contents'}[5]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[5];
-$result_trees{'index_nodes'}{'contents'}[5]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[5];
+$result_trees{'index_nodes'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[4];
+$result_trees{'index_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'index_nodes'}{'contents'}[5]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[5];
 
$result_trees{'index_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[5];
+$result_trees{'index_nodes'}{'contents'}[5]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'index_nodes'}{'contents'}[5];
 
 $result_texis{'index_nodes'} = '\\input texinfo @c -*-texinfo-*-
 
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 8aee58d4d8..8684c6f4b8 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
@@ -31,24 +31,27 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -342,62 +345,65 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chap first'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chap first'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -721,46 +727,49 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'second'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap first'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'second'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'chap-first'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'chap first'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'chap-first'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'menu',
           'contents' => [
@@ -969,72 +978,75 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'another'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'a node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'another'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'a-node'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'a node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'a-node'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'second'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'second'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'second'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1172,69 +1184,72 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'a node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'another'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'a node'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'another'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'another'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'another'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'second'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'second'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'second'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -1461,28 +1476,28 @@ $result_trees{'index_nodes_no_split_no_use_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[10]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'args'}[2]{'contents'}[0];
-$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[0]{'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'}[0]{'contents'}[2]{'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'}[0]{'contents'}[3]{'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'}[0]{'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]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'args'}[2]{'contents'}[0];
-$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'args'}[3]{'contents'}[0];
-$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4];
+$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[1]{'contents'}[1]{'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'}[11]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[1]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[1]{'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]{'contents'}[2]{'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]{'contents'}[3]{'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]{'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'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'contents'}[2]{'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'}{'element_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4];
-$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'args'}[1]{'extra'}{'node_content'}{'contents'}[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]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'args'}[3]{'contents'}[0];
-$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'contents'}[0]{'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'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5];
+$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[4];
+$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5]{'contents'}[1]{'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'}{'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'}[6]{'extra'}{'element_node'}
 = $result_trees{'index_nodes_no_split_no_use_nodes'}{'contents'}[5];
 
 $result_texis{'index_nodes_no_split_no_use_nodes'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/indices/index_special_region.pl 
b/tp/t/results/indices/index_special_region.pl
index be8c57cddd..4996e70e17 100644
--- a/tp/t/results/indices/index_special_region.pl
+++ b/tp/t/results/indices/index_special_region.pl
@@ -587,23 +587,28 @@ $result_trees{'index_special_region'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -619,23 +624,28 @@ $result_trees{'index_special_region'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'top',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
@@ -648,33 +658,36 @@ $result_trees{'index_special_region'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'comment_at_end' => {
-              'args' => [
+              'contents' => [
                 {
-                  'text' => ' note this chapter is not associated to a node
-',
-                  'type' => 'rawline_arg'
+                  'text' => 'Chapter'
                 }
               ],
-              'cmdname' => 'c'
-            },
-            'spaces_after_argument' => {
-              'text' => '  '
+              'info' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'text' => ' note this chapter is not associated to a node
+',
+                      'type' => 'rawline_arg'
+                    }
+                  ],
+                  'cmdname' => 'c'
+                },
+                'spaces_after_argument' => {
+                  'text' => '  '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1258,23 +1271,28 @@ $result_trees{'index_special_region'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Copying and indices'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Copying and indices'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -1291,24 +1309,27 @@ $result_trees{'index_special_region'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Copying and indices'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Copying and indices'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1681,16 +1702,16 @@ $result_trees{'index_special_region'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_special_region'}{'contents'}[1];
-$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[12]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_special_region'}{'contents'}[4];
-$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'index_special_region'}{'contents'}[4];
-$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'index_special_region'}{'contents'}[1];
+$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[11]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_special_region'}{'contents'}[1];
+$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[11]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_special_region'}{'contents'}[4];
+$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'index_special_region'}{'contents'}[4];
+$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[10]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'index_special_region'} = '\\input texinfo @c -*-texinfo-*-
 
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 6d629dc890..16567e53d3 100644
--- a/tp/t/results/indices/index_special_region_no_insertcopying.pl
+++ b/tp/t/results/indices/index_special_region_no_insertcopying.pl
@@ -587,23 +587,28 @@ $result_trees{'index_special_region_no_insertcopying'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -619,23 +624,28 @@ $result_trees{'index_special_region_no_insertcopying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'top',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
@@ -648,33 +658,36 @@ $result_trees{'index_special_region_no_insertcopying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'comment_at_end' => {
-              'args' => [
+              'contents' => [
                 {
-                  'text' => ' note this chapter is not associated to a node
-',
-                  'type' => 'rawline_arg'
+                  'text' => 'Chapter'
                 }
               ],
-              'cmdname' => 'c'
-            },
-            'spaces_after_argument' => {
-              'text' => '  '
+              'info' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'text' => ' note this chapter is not associated to a node
+',
+                      'type' => 'rawline_arg'
+                    }
+                  ],
+                  'cmdname' => 'c'
+                },
+                'spaces_after_argument' => {
+                  'text' => '  '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1253,23 +1266,28 @@ $result_trees{'index_special_region_no_insertcopying'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Copying and indices'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Copying and indices'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -1286,24 +1304,27 @@ $result_trees{'index_special_region_no_insertcopying'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Copying and indices'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Copying and indices'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1671,16 +1692,16 @@ $result_trees{'index_special_region_no_insertcopying'} 
= {
   ],
   'type' => 'document_root'
 };
-$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'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_no_insertcopying'}{'contents'}[1];
-$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[12]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_no_insertcopying'}{'contents'}[4];
-$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_no_insertcopying'}{'contents'}[4];
-$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_no_insertcopying'}{'contents'}[1];
+$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[11]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_no_insertcopying'}{'contents'}[1];
+$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[11]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_no_insertcopying'}{'contents'}[4];
+$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_no_insertcopying'}{'contents'}[4];
+$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[10]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'index_special_region_no_insertcopying'} = '\\input texinfo @c 
-*-texinfo-*-
 
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 d6960b6b25..273006776d 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
@@ -587,23 +587,28 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -619,23 +624,28 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'top',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
@@ -648,33 +658,36 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'comment_at_end' => {
-              'args' => [
+              'contents' => [
                 {
-                  'text' => ' note this chapter is not associated to a node
-',
-                  'type' => 'rawline_arg'
+                  'text' => 'Chapter'
                 }
               ],
-              'cmdname' => 'c'
-            },
-            'spaces_after_argument' => {
-              'text' => '  '
+              'info' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'text' => ' note this chapter is not associated to a node
+',
+                      'type' => 'rawline_arg'
+                    }
+                  ],
+                  'cmdname' => 'c'
+                },
+                'spaces_after_argument' => {
+                  'text' => '  '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1253,23 +1266,28 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Copying and indices'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Copying and indices'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -1286,24 +1304,27 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Copying and indices'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Copying and indices'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1671,16 +1692,16 @@ 
$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'}[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'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[1];
-$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[4];
-$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'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'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[6]{'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'}[11]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[1];
+$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[11]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[4]{'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'}[6]{'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'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[10]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = 
'\\input texinfo @c -*-texinfo-*-
 
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 cdeffa7b82..6130f55531 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
@@ -587,23 +587,28 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -619,23 +624,28 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'top',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
@@ -648,33 +658,36 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'comment_at_end' => {
-              'args' => [
+              'contents' => [
                 {
-                  'text' => ' note this chapter is not associated to a node
-',
-                  'type' => 'rawline_arg'
+                  'text' => 'Chapter'
                 }
               ],
-              'cmdname' => 'c'
-            },
-            'spaces_after_argument' => {
-              'text' => '  '
+              'info' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'text' => ' note this chapter is not associated to a node
+',
+                      'type' => 'rawline_arg'
+                    }
+                  ],
+                  'cmdname' => 'c'
+                },
+                'spaces_after_argument' => {
+                  'text' => '  '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1253,23 +1266,28 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Copying and indices'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Copying and indices'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -1286,24 +1304,27 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Copying and indices'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Copying and indices'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1671,16 +1692,16 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[1];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[4];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'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'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[6]{'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'}[11]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[1];
+$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[11]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[4]{'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'}[6]{'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'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[10]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'index_special_region_no_insertcopying_titlepage_no_nodes'} = 
'\\input texinfo @c -*-texinfo-*-
 
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 bbced8db5c..4dd7451adb 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
@@ -587,23 +587,28 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -619,23 +624,28 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'top',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
@@ -648,33 +658,36 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'comment_at_end' => {
-              'args' => [
+              'contents' => [
                 {
-                  'text' => ' note this chapter is not associated to a node
-',
-                  'type' => 'rawline_arg'
+                  'text' => 'Chapter'
                 }
               ],
-              'cmdname' => 'c'
-            },
-            'spaces_after_argument' => {
-              'text' => '  '
+              'info' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'text' => ' note this chapter is not associated to a node
+',
+                      'type' => 'rawline_arg'
+                    }
+                  ],
+                  'cmdname' => 'c'
+                },
+                'spaces_after_argument' => {
+                  'text' => '  '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1253,23 +1266,28 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Copying and indices'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Copying and indices'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -1286,24 +1304,27 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Copying and indices'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Copying and indices'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1671,16 +1692,16 @@ 
$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'}[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'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[1];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[12]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[4];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[5]{'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'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[6]{'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'}[11]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[1];
+$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[11]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[4]{'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'}[6]{'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'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[10]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
 
$result_texis{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}
 = '\\input texinfo @c -*-texinfo-*-
 
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 72c253bfcd..af34206b19 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
@@ -587,23 +587,28 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -619,23 +624,28 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'top',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
@@ -648,33 +658,36 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'comment_at_end' => {
-              'args' => [
+              'contents' => [
                 {
-                  'text' => ' note this chapter is not associated to a node
-',
-                  'type' => 'rawline_arg'
+                  'text' => 'Chapter'
                 }
               ],
-              'cmdname' => 'c'
-            },
-            'spaces_after_argument' => {
-              'text' => '  '
+              'info' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'text' => ' note this chapter is not associated to a node
+',
+                      'type' => 'rawline_arg'
+                    }
+                  ],
+                  'cmdname' => 'c'
+                },
+                'spaces_after_argument' => {
+                  'text' => '  '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1258,23 +1271,28 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Copying and indices'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Copying and indices'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -1291,24 +1309,27 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Copying and indices'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Copying and indices'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1681,16 +1702,16 @@ 
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[1];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[4];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'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'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[6]{'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'}[11]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[1];
+$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[11]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[4]{'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'}[6]{'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'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[10]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'index_special_region_no_titlepage_no_nodes'} = '\\input texinfo 
@c -*-texinfo-*-
 
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 fe502bd512..012b032143 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
@@ -587,23 +587,28 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -619,23 +624,28 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'top',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
@@ -648,33 +658,36 @@ $result_trees{'index_special_region_titlepage_no_nodes'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'comment_at_end' => {
-              'args' => [
+              'contents' => [
                 {
-                  'text' => ' note this chapter is not associated to a node
-',
-                  'type' => 'rawline_arg'
+                  'text' => 'Chapter'
                 }
               ],
-              'cmdname' => 'c'
-            },
-            'spaces_after_argument' => {
-              'text' => '  '
+              'info' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'text' => ' note this chapter is not associated to a node
+',
+                      'type' => 'rawline_arg'
+                    }
+                  ],
+                  'cmdname' => 'c'
+                },
+                'spaces_after_argument' => {
+                  'text' => '  '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1258,23 +1271,28 @@ 
$result_trees{'index_special_region_titlepage_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Copying and indices'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Copying and indices'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -1291,24 +1309,27 @@ 
$result_trees{'index_special_region_titlepage_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Copying and indices'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Copying and indices'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1681,16 +1702,16 @@ 
$result_trees{'index_special_region_titlepage_no_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[1];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[4];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[4];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[1];
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[11]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[1];
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[11]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[4];
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[4];
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[10]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'index_special_region_titlepage_no_nodes'} = '\\input texinfo @c 
-*-texinfo-*-
 
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 e403ae7cf1..19c68fc93c 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
@@ -587,23 +587,28 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -619,23 +624,28 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'top',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
@@ -648,33 +658,36 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'comment_at_end' => {
-              'args' => [
+              'contents' => [
                 {
-                  'text' => ' note this chapter is not associated to a node
-',
-                  'type' => 'rawline_arg'
+                  'text' => 'Chapter'
                 }
               ],
-              'cmdname' => 'c'
-            },
-            'spaces_after_argument' => {
-              'text' => '  '
+              'info' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'text' => ' note this chapter is not associated to a node
+',
+                      'type' => 'rawline_arg'
+                    }
+                  ],
+                  'cmdname' => 'c'
+                },
+                'spaces_after_argument' => {
+                  'text' => '  '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1258,23 +1271,28 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Copying and indices'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Copying and indices'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -1291,24 +1309,27 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Copying and indices'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Copying and indices'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1681,16 +1702,16 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[1];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[12]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[4];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[5]{'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'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[6]{'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'}[11]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[1];
+$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[11]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[4]{'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'}[6]{'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'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[10]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'index_special_region_titlepage_no_nodes_footnotes_default'} = 
'\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/indices/index_split.pl 
b/tp/t/results/indices/index_split.pl
index 4e9b2e9bbb..28afa5d3cc 100644
--- a/tp/t/results/indices/index_split.pl
+++ b/tp/t/results/indices/index_split.pl
@@ -31,23 +31,28 @@ $result_trees{'index_split'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -64,24 +69,27 @@ $result_trees{'index_split'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'split indices'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'split indices'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -465,24 +473,27 @@ $result_trees{'index_split'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -785,24 +796,27 @@ $result_trees{'index_split'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'First chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'First chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -1275,23 +1289,28 @@ $result_trees{'index_split'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -1308,24 +1327,27 @@ $result_trees{'index_split'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1630,23 +1652,28 @@ $result_trees{'index_split'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'subsection-1'
@@ -1662,24 +1689,27 @@ $result_trees{'index_split'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Subsection 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Subsection 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1714,23 +1744,28 @@ $result_trees{'index_split'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -1747,24 +1782,27 @@ $result_trees{'index_split'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Subsection 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Subsection 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1921,23 +1959,28 @@ $result_trees{'index_split'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section-2'
@@ -1953,24 +1996,27 @@ $result_trees{'index_split'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+              'contents' => [
+                {
+                  'text' => 'Section 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
+              },
+              'type' => 'line_arg'
+            }
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2005,23 +2051,28 @@ $result_trees{'index_split'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -2038,24 +2089,27 @@ $result_trees{'index_split'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2156,59 +2210,62 @@ $result_trees{'index_split'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'node in section 3'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section 3'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'node in section 3'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'section-3'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'section 3'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'section-3'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'first'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'first'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2281,46 +2338,49 @@ $result_trees{'index_split'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'node 2 in section 3'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'node 2 in section 3'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'first'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'first'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2554,46 +2614,49 @@ $result_trees{'index_split'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'node 3 in section 3'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'node 3 in section 3'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'first'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'first'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2657,23 +2720,28 @@ $result_trees{'index_split'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'second chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'second-chapter'
@@ -2689,24 +2757,27 @@ $result_trees{'index_split'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Second chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Second chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2753,40 +2824,40 @@ $result_trees{'index_split'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_split'}{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[1];
-$result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
-$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
-$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
-$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
-$result_trees{'index_split'}{'contents'}[3]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
-$result_trees{'index_split'}{'contents'}[4]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
+$result_trees{'index_split'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[1];
+$result_trees{'index_split'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split'}{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
+$result_trees{'index_split'}{'contents'}[3]{'contents'}[2]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
+$result_trees{'index_split'}{'contents'}[3]{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
+$result_trees{'index_split'}{'contents'}[3]{'contents'}[2]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
+$result_trees{'index_split'}{'contents'}[3]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
-$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[6]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[5];
-$result_trees{'index_split'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[6]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[3]{'contents'}[2]{'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'}[10]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[9];
-$result_trees{'index_split'}{'contents'}[10]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[9];
-$result_trees{'index_split'}{'contents'}[14]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[13];
-$result_trees{'index_split'}{'contents'}[15]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'index_split'}{'contents'}[15]{'args'}[2]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[15]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'index_split'}{'contents'}[15]{'args'}[3]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[15]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[15];
-$result_trees{'index_split'}{'contents'}[16]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'index_split'}{'contents'}[16]{'args'}[3]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[16]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[16];
-$result_trees{'index_split'}{'contents'}[16]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[16];
-$result_trees{'index_split'}{'contents'}[16]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[16];
-$result_trees{'index_split'}{'contents'}[17]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'index_split'}{'contents'}[17]{'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'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[3];
+$result_trees{'index_split'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split'}{'contents'}[4]{'contents'}[5]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[5]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split'}{'contents'}[4]{'contents'}[5]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[5]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split'}{'contents'}[4]{'contents'}[5]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[5]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split'}{'contents'}[4]{'contents'}[5]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[5]{'contents'}[6]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split'}{'contents'}[6]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[5];
+$result_trees{'index_split'}{'contents'}[6]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split'}{'contents'}[6]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split'}{'contents'}[6]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[5];
+$result_trees{'index_split'}{'contents'}[10]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[9];
+$result_trees{'index_split'}{'contents'}[10]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[9];
+$result_trees{'index_split'}{'contents'}[14]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[13];
+$result_trees{'index_split'}{'contents'}[15]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split'}{'contents'}[15]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'index_split'}{'contents'}[15]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split'}{'contents'}[15]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'index_split'}{'contents'}[15]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[15];
+$result_trees{'index_split'}{'contents'}[16]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split'}{'contents'}[16]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'index_split'}{'contents'}[16]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[16];
+$result_trees{'index_split'}{'contents'}[16]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[16];
+$result_trees{'index_split'}{'contents'}[16]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[16];
+$result_trees{'index_split'}{'contents'}[17]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split'}{'contents'}[17]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'index_split'}{'contents'}[17]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_split'}{'contents'}[17];
 
 $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 52d96eb16b..cf165de0e0 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
@@ -31,23 +31,28 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -64,24 +69,27 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'split indices'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'split indices'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -465,24 +473,27 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -785,24 +796,27 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'First chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'First chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -1275,23 +1289,28 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -1308,24 +1327,27 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1630,23 +1652,28 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'subsection-1'
@@ -1662,24 +1689,27 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Subsection 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Subsection 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1714,23 +1744,28 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -1747,24 +1782,27 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Subsection 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Subsection 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1921,23 +1959,28 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section-2'
@@ -1953,24 +1996,27 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+              'contents' => [
+                {
+                  'text' => 'Section 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
+              },
+              'type' => 'line_arg'
+            }
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2005,23 +2051,28 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -2038,24 +2089,27 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2156,59 +2210,62 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'node in section 3'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section 3'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'node in section 3'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'section-3'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'section 3'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'section-3'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'first'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'first'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2281,46 +2338,49 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'node 2 in section 3'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'node 2 in section 3'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'first'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'first'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2554,46 +2614,49 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'node 3 in section 3'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'node 3 in section 3'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'first'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'first'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2657,23 +2720,28 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'second chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'second-chapter'
@@ -2689,24 +2757,27 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Second chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Second chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2753,40 +2824,40 @@ $result_trees{'index_split_split_chapter_no_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[10]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[10]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[10]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[7]{'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'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[1];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[2]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[2]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[5];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[3]{'contents'}[2]{'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'}[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'}[7]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[9];
-$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'}[15]{'args'}[2]{'extra'}{'node_content'}{'contents'}[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]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15]{'args'}[3]{'contents'}[0];
-$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'}[16]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'args'}[3]{'contents'}[0];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'contents'}[6]{'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'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16];
-$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[17]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[17]{'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'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[3];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[5]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[5]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[5]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[5]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[5]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[5]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[5]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[5]{'contents'}[6]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[5];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[5];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[10]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[9];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[10]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[9];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[14]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[13];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[15];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[16];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[17]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[17]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[17]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_split_split_chapter_no_nodes'}{'contents'}[17];
 
 $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 79b2fd87c5..c3b22520e6 100644
--- a/tp/t/results/indices/index_table.pl
+++ b/tp/t/results/indices/index_table.pl
@@ -31,23 +31,28 @@ $result_trees{'index_table'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'index_table'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Test for indices'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Test for indices'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'menu',
           'contents' => [
@@ -294,23 +302,28 @@ $result_trees{'index_table'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node with ftable and vtable'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node with ftable and vtable'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-with-ftable-and-vtable'
@@ -326,24 +339,27 @@ $result_trees{'index_table'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first node chapter, with ftable and vtable'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first node chapter, with ftable and vtable'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -887,23 +903,28 @@ $result_trees{'index_table'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node with printindex'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node with printindex'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -920,24 +941,27 @@ $result_trees{'index_table'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node with printindex'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node with printindex'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1062,23 +1086,28 @@ $result_trees{'index_table'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'indices refs'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'indices refs'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -1095,24 +1124,27 @@ $result_trees{'index_table'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Indices refs'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Indices refs'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'menu',
           'contents' => [
@@ -6028,32 +6060,37 @@ $result_trees{'index_table'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node'
@@ -6069,24 +6106,27 @@ $result_trees{'index_table'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -6148,20 +6188,19 @@ $result_trees{'index_table'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_table'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_table'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_table'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_table'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_table'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_table'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_table'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[3];
-$result_trees{'index_table'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[3];
-$result_trees{'index_table'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[3];
-$result_trees{'index_table'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[3];
-$result_trees{'index_table'}{'contents'}[4]{'contents'}[7]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_table'}{'contents'}[4]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[3];
-$result_trees{'index_table'}{'contents'}[4]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[3];
-$result_trees{'index_table'}{'contents'}[4]{'contents'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[3];
-$result_trees{'index_table'}{'contents'}[4]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_table'}{'contents'}[8]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_table'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_table'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_table'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_table'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_table'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_table'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[3];
+$result_trees{'index_table'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[3];
+$result_trees{'index_table'}{'contents'}[4]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[3];
+$result_trees{'index_table'}{'contents'}[4]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[3];
+$result_trees{'index_table'}{'contents'}[4]{'contents'}[8]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$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'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[3];
+$result_trees{'index_table'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[3];
+$result_trees{'index_table'}{'contents'}[4]{'contents'}[11]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
@@ -6289,6 +6328,7 @@ 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[125]{'extra'}{'element_n
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[126]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[127]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
$result_trees{'index_table'}{'contents'}[8]{'contents'}[128]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
+$result_trees{'index_table'}{'contents'}[8]{'contents'}[129]{'extra'}{'element_node'}
 = $result_trees{'index_table'}{'contents'}[7];
 
 $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 cd52cd9259..3c868284ef 100644
--- a/tp/t/results/indices/index_table_chapter_no_node.pl
+++ b/tp/t/results/indices/index_table_chapter_no_node.pl
@@ -31,23 +31,28 @@ $result_trees{'index_table_chapter_no_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'index_table_chapter_no_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Test for indices'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Test for indices'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'menu',
           'contents' => [
@@ -294,23 +302,28 @@ $result_trees{'index_table_chapter_no_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node with ftable and vtable'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node with ftable and vtable'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-with-ftable-and-vtable'
@@ -326,24 +339,27 @@ $result_trees{'index_table_chapter_no_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first node chapter, with ftable and vtable'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first node chapter, with ftable and vtable'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -887,23 +903,28 @@ $result_trees{'index_table_chapter_no_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node with printindex'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node with printindex'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -920,24 +941,27 @@ $result_trees{'index_table_chapter_no_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node with printindex'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node with printindex'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1062,23 +1086,28 @@ $result_trees{'index_table_chapter_no_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'indices refs'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'indices refs'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -1095,24 +1124,27 @@ $result_trees{'index_table_chapter_no_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Indices refs'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Indices refs'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'menu',
           'contents' => [
@@ -6028,32 +6060,37 @@ $result_trees{'index_table_chapter_no_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node'
@@ -6069,24 +6106,27 @@ $result_trees{'index_table_chapter_no_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -6148,20 +6188,19 @@ $result_trees{'index_table_chapter_no_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[7]{'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'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[7]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[10]{'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'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[10]{'contents'}[2]{'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'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'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'}[8]{'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'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[8]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$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'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'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]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
@@ -6289,6 +6328,7 @@ 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[125]{'ex
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[126]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[127]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
$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'}[129]{'extra'}{'element_node'}
 = $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
 
 $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 3e87e37e61..b5f7bf2958 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
@@ -16,23 +16,28 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,19 +52,22 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -72,23 +80,28 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -104,24 +117,27 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -417,12 +433,12 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
   ],
   'type' => 'document_root'
 };
-$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'}{'seealso'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[10];
-$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'extra'}{'seeentry'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[6];
 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[3];
+$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'extra'}{'seealso'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[10];
+$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'extra'}{'seeentry'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[6];
 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[3];
-$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'extra'}{'seeentry'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[2];
+$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[3];
+$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'extra'}{'seeentry'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[2];
 
 $result_texis{'multiple_index_text_sortas_seeentry_seealso'} = '@node Top
 @top
diff --git a/tp/t/results/indices/nodes_before_top.pl 
b/tp/t/results/indices/nodes_before_top.pl
index 6d5b22bbc3..3091e8bb4a 100644
--- a/tp/t/results/indices/nodes_before_top.pl
+++ b/tp/t/results/indices/nodes_before_top.pl
@@ -53,74 +53,77 @@ $result_trees{'nodes_before_top'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'first before top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'first before top'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => '('
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => 'dir'
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -323,46 +326,49 @@ $result_trees{'nodes_before_top'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'node in menu before top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first before top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'node in menu before top'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'first-before-top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'first before top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'first-before-top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -516,48 +522,51 @@ $result_trees{'nodes_before_top'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'Top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first before top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'first-before-top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'first before top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'first-before-top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -851,62 +860,65 @@ $result_trees{'nodes_before_top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap first'
+              'contents' => [
+                {
+                  'text' => 'chap first'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
           ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
+          'type' => 'argument'
         },
-        {
-          'contents' => [
-            {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
-              'contents' => [
-                {}
-              ]
-            },
-            'normalized' => 'Top'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
-              'contents' => [
-                {}
-              ]
-            },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
         {
           'contents' => [
             {
@@ -1193,46 +1205,49 @@ $result_trees{'nodes_before_top'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'second'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap first'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'second'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'chap-first'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'chap first'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'chap-first'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'menu',
           'contents' => [
@@ -1441,72 +1456,75 @@ $result_trees{'nodes_before_top'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'another'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'a node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'another'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'a-node'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'a node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'a-node'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'second'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'second'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'second'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1644,69 +1662,72 @@ $result_trees{'nodes_before_top'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'a node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'another'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'a node'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'another'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'another'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'another'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'second'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'second'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'second'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -1933,35 +1954,35 @@ $result_trees{'nodes_before_top'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[1];
-$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[2];
-$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[2];
-$result_trees{'nodes_before_top'}{'contents'}[3]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[3];
-$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[4]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[4]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[4]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[4]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[4];
-$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[4];
-$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[4];
-$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[5]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[6]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[6]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[6]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[6]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[6];
+$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[1];
+$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[2];
+$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[2];
+$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[3];
+$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[4];
+$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[4];
+$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[4];
+$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[6];
 
$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'}[7]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[7]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[7]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[7]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[7];
-$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[7];
+$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[6];
+$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[7];
 
$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'}[6]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[7];
 
 $result_texis{'nodes_before_top'} = '\\input texinfo @c -*-texinfo-*-
 
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 d309d25667..31cfcfb4b5 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
@@ -31,74 +31,77 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'first before top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'first before top'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => '('
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => 'dir'
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -357,46 +360,49 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'node in menu before top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first before top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'node in menu before top'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'first-before-top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'first before top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'first-before-top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -559,48 +565,51 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'Top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first before top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'first-before-top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'first before top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'first-before-top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -792,24 +801,27 @@ $result_trees{'nodes_before_top_and_sections_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -1079,62 +1091,65 @@ $result_trees{'nodes_before_top_and_sections_chapter'} 
= {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'first'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'first'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -1421,46 +1436,49 @@ $result_trees{'nodes_before_top_and_sections_chapter'} 
= {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'second'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'second'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'first'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'first'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'menu',
           'contents' => [
@@ -1669,72 +1687,75 @@ $result_trees{'nodes_before_top_and_sections_chapter'} 
= {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'another'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'a node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'another'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'a-node'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'a node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'a-node'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'second'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'second'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'second'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1872,69 +1893,72 @@ $result_trees{'nodes_before_top_and_sections_chapter'} 
= {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'a node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'another'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'a node'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'another'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'another'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'another'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'second'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'second'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'second'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -2149,58 +2173,63 @@ $result_trees{'nodes_before_top_and_sections_chapter'} 
= {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chapter'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node in chapter'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'node-in-chapter'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'node in chapter'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'node-in-chapter'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -2217,24 +2246,27 @@ $result_trees{'nodes_before_top_and_sections_chapter'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'A chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'A chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2293,64 +2325,67 @@ $result_trees{'nodes_before_top_and_sections_chapter'} 
= {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'node in chapter'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'node in chapter'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'chapter'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'chapter'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2426,43 +2461,43 @@ $result_trees{'nodes_before_top_and_sections_chapter'} 
= {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}{'contents'}[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]{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3]{'args'}[2]{'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'}[4]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[0]{'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'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[2];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[3];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[5]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[4]{'contents'}[5]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[1]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[1]{'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'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[5]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'contents'}[2]{'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'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'args'}[1]{'extra'}{'node_content'}{'contents'}[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]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[7];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8]{'contents'}[1]{'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'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8];
-$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[9]{'args'}[1]{'extra'}{'node_content'}{'contents'}[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]{'args'}[3]{'extra'}{'node_content'}{'contents'}[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]{'args'}[2]{'extra'}{'node_content'}{'contents'}[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]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11]{'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'}[8]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[8];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[9]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[9]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[9]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_and_sections_chapter'}{'contents'}[11];
 
 $result_texis{'nodes_before_top_and_sections_chapter'} = '\\input texinfo @c 
-*-texinfo-*-
 
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 2133089d93..2898c3d275 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
@@ -31,74 +31,77 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'first before top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'first before top'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => '('
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => 'dir'
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -357,46 +360,49 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'node in menu before top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first before top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'node in menu before top'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'first-before-top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'first before top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'first-before-top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -559,48 +565,51 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'Top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first before top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'first-before-top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'first before top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'first-before-top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -792,24 +801,27 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -1079,62 +1091,65 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'first'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'first'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -1421,46 +1436,49 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'second'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'second'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'first'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'first'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'menu',
           'contents' => [
@@ -1669,72 +1687,75 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'another'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'a node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'another'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'a-node'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'a node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'a-node'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'second'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'second'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'second'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1872,69 +1893,72 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'a node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'another'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'a node'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'another'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'another'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'another'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'second'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'second'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'second'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -2149,58 +2173,63 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chapter'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node in chapter'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'node-in-chapter'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'node in chapter'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'node-in-chapter'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -2217,24 +2246,27 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'A chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'A chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2293,64 +2325,67 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'node in chapter'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'node in chapter'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'chapter'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'chapter'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2426,43 +2461,43 @@ 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}{'contents'}[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]{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'contents'}[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'}[3]{'args'}[2]{'extra'}{'node_content'}{'contents'}[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'}[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'}[4]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[3];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'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'}[0]{'contents'}[2]{'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'}[0]{'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'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'contents'}[1]{'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'}[8]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[2]{'contents'}[2]{'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'}[7]{'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'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[3];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[3];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[5]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[4]{'contents'}[5]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'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'}[1]{'contents'}[2]{'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'}[1]{'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'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[5]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[7]{'contents'}[2]{'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'}{'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'}[8]{'args'}[1]{'extra'}{'node_content'}{'contents'}[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]{'args'}[3]{'extra'}{'node_content'}{'contents'}[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'}[8]{'contents'}[0]{'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'}[4]{'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'}[7]{'contents'}[4]{'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'}[8]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[8]{'contents'}[1]{'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'}{'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'}[9]{'args'}[1]{'extra'}{'node_content'}{'contents'}[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]{'args'}[3]{'extra'}{'node_content'}{'contents'}[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]{'args'}[2]{'extra'}{'node_content'}{'contents'}[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]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11]{'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'}[8]{'contents'}[6]{'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'}[9]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[9]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[9]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11]{'contents'}[2]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_chapter_no_node'}{'contents'}[11];
 
 $result_texis{'nodes_before_top_and_sections_chapter_no_node'} = '\\input 
texinfo @c -*-texinfo-*-
 
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 a3e45ba1bf..cac0f0d8fa 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
@@ -31,74 +31,77 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'first before top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'first before top'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => '('
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => 'dir'
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -357,46 +360,49 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'node in menu before top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first before top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'node in menu before top'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'first-before-top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'first before top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'first-before-top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -559,48 +565,51 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'Top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first before top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'first-before-top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'first before top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'first-before-top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -792,24 +801,27 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -1079,62 +1091,65 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'first'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'first'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -1421,46 +1436,49 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'second'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'second'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'first'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'first'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'menu',
           'contents' => [
@@ -1669,72 +1687,75 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'another'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'a node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'another'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'a-node'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'a node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'a-node'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'second'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'second'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'second'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1872,69 +1893,72 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'a node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'another'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'a node'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'another'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'another'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'another'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'second'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'second'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'second'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -2149,58 +2173,63 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chapter'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node in chapter'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'node-in-chapter'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'node in chapter'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'node-in-chapter'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -2217,24 +2246,27 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'A chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'A chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2293,64 +2325,67 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'node in chapter'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'node in chapter'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'chapter'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'chapter'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2426,43 +2461,43 @@ 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}{'contents'}[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]{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'contents'}[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'}[3]{'args'}[2]{'extra'}{'node_content'}{'contents'}[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'}[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'}[4]{'contents'}[0]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[3];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'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'}[0]{'contents'}[2]{'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'}[0]{'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'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'contents'}[1]{'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'}[8]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[2]{'contents'}[2]{'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'}[7]{'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'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[3];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[3];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[5]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[4]{'contents'}[5]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'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'}[1]{'contents'}[2]{'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'}[1]{'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'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[5]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[7]{'contents'}[2]{'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'}{'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'}[8]{'args'}[1]{'extra'}{'node_content'}{'contents'}[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]{'args'}[3]{'extra'}{'node_content'}{'contents'}[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'}[8]{'contents'}[0]{'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'}[4]{'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'}[7]{'contents'}[4]{'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'}[8]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[8]{'contents'}[1]{'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'}{'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'}[9]{'args'}[1]{'extra'}{'node_content'}{'contents'}[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]{'args'}[3]{'extra'}{'node_content'}{'contents'}[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]{'args'}[2]{'extra'}{'node_content'}{'contents'}[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]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11]{'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'}[8]{'contents'}[6]{'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'}[9]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[9]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[9]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11]{'contents'}[2]{'extra'}{'element_node'}
 = 
$result_trees{'nodes_before_top_and_sections_unsplit_no_nodes'}{'contents'}[11];
 
 $result_texis{'nodes_before_top_and_sections_unsplit_no_nodes'} = '\\input 
texinfo @c -*-texinfo-*-
 
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 7a013b2ad1..206b25166a 100644
--- a/tp/t/results/indices/nodes_before_top_split_chapter.pl
+++ b/tp/t/results/indices/nodes_before_top_split_chapter.pl
@@ -53,74 +53,77 @@ $result_trees{'nodes_before_top_split_chapter'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'first before top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'first before top'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => '('
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => 'dir'
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -323,46 +326,49 @@ $result_trees{'nodes_before_top_split_chapter'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'node in menu before top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first before top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'node in menu before top'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'first-before-top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'first before top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'first-before-top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -516,48 +522,51 @@ $result_trees{'nodes_before_top_split_chapter'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'Top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first before top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'first-before-top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'first before top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'first-before-top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -851,62 +860,65 @@ $result_trees{'nodes_before_top_split_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap first'
+              'contents' => [
+                {
+                  'text' => 'chap first'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
           ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
+          'type' => 'argument'
         },
-        {
-          'contents' => [
-            {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
-              'contents' => [
-                {}
-              ]
-            },
-            'normalized' => 'Top'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
-              'contents' => [
-                {}
-              ]
-            },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
         {
           'contents' => [
             {
@@ -1193,46 +1205,49 @@ $result_trees{'nodes_before_top_split_chapter'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'second'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap first'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'second'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'chap-first'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'chap first'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'chap-first'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'menu',
           'contents' => [
@@ -1441,72 +1456,75 @@ $result_trees{'nodes_before_top_split_chapter'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'another'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'a node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'another'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'a-node'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'a node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'a-node'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'second'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'second'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'second'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1644,69 +1662,72 @@ $result_trees{'nodes_before_top_split_chapter'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'a node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'another'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'a node'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'another'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'another'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'another'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'second'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'second'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'second'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -1933,35 +1954,35 @@ $result_trees{'nodes_before_top_split_chapter'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[1];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[2];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[2];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[3];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[4];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[4];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[4];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[6];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[1];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[2];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[2]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[2];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[3];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[3]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[4];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[4];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[4];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[5]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[6];
 
$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'}[7]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[7];
-$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[7];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[6]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[6];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter'}{'contents'}[7]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[7];
 
$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'}[6]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter'}{'contents'}[7];
 
 $result_texis{'nodes_before_top_split_chapter'} = '\\input texinfo @c 
-*-texinfo-*-
 
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 715f7e04c5..14a0e63d4b 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
@@ -53,74 +53,77 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'first before top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'first before top'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => '('
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => 'dir'
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -323,46 +326,49 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'node in menu before top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first before top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'node in menu before top'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'first-before-top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'first before top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'first-before-top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -516,48 +522,51 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'Top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first before top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'first-before-top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'first before top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'first-before-top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -851,62 +860,65 @@ $result_trees{'nodes_before_top_split_chapter_no_nodes'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap first'
+              'contents' => [
+                {
+                  'text' => 'chap first'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
           ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
+          'type' => 'argument'
         },
-        {
-          'contents' => [
-            {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
-              'contents' => [
-                {}
-              ]
-            },
-            'normalized' => 'Top'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
-              'contents' => [
-                {}
-              ]
-            },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
         {
           'contents' => [
             {
@@ -1193,46 +1205,49 @@ 
$result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'second'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap first'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'second'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'chap-first'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'chap first'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'chap-first'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'menu',
           'contents' => [
@@ -1441,72 +1456,75 @@ 
$result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'another'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'a node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'another'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'a-node'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'a node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'a-node'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'second'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'second'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'second'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1644,69 +1662,72 @@ 
$result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'a node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'another'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'a node'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'another'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'another'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'another'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'second'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'second'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'second'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -1933,35 +1954,35 @@ 
$result_trees{'nodes_before_top_split_chapter_no_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}{'contents'}[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]{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[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'}[3]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'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'}[0]{'contents'}[2]{'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'}[0]{'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'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'contents'}[1]{'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'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2]{'contents'}[2]{'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'}[6]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[2];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[1]{'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'}[11]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[3]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'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'}[1]{'contents'}[2]{'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'}[1]{'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'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[5]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[2]{'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'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'args'}[1]{'extra'}{'node_content'}{'contents'}[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]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'contents'}[0]{'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'}[4]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[6];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7]{'contents'}[1]{'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'}{'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'}[6]{'extra'}{'element_node'}
 = $result_trees{'nodes_before_top_split_chapter_no_nodes'}{'contents'}[7];
 
 $result_texis{'nodes_before_top_split_chapter_no_nodes'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/indices/print_merged_index.pl 
b/tp/t/results/indices/print_merged_index.pl
index 3cb7e44374..c5722df750 100644
--- a/tp/t/results/indices/print_merged_index.pl
+++ b/tp/t/results/indices/print_merged_index.pl
@@ -46,23 +46,28 @@ $result_trees{'print_merged_index'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -77,24 +82,27 @@ $result_trees{'print_merged_index'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
diff --git a/tp/t/results/indices/printindex_between_node_section.pl 
b/tp/t/results/indices/printindex_between_node_section.pl
index 415b573dd4..020c4312f1 100644
--- a/tp/t/results/indices/printindex_between_node_section.pl
+++ b/tp/t/results/indices/printindex_between_node_section.pl
@@ -16,23 +16,28 @@ $result_trees{'printindex_between_node_section'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'printindex_between_node_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -231,23 +239,28 @@ $result_trees{'printindex_between_node_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node chap1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node chap1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-chap1'
@@ -262,24 +275,27 @@ $result_trees{'printindex_between_node_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -376,24 +392,27 @@ $result_trees{'printindex_between_node_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node sec1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node sec1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -442,23 +461,28 @@ $result_trees{'printindex_between_node_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {
         'section_number' => '1.1'
       },
@@ -474,12 +498,12 @@ $result_trees{'printindex_between_node_section'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[2]{'extra'}{'element_node'}
 = $result_trees{'printindex_between_node_section'}{'contents'}[1];
 
$result_trees{'printindex_between_node_section'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'printindex_between_node_section'}{'contents'}[1];
 
$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'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'printindex_between_node_section'}{'contents'}[3];
+$result_trees{'printindex_between_node_section'}{'contents'}[2]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'printindex_between_node_section'}{'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'}[3]{'extra'}{'element_node'}
 = $result_trees{'printindex_between_node_section'}{'contents'}[3];
 
 $result_texis{'printindex_between_node_section'} = '@node Top
 @top top
diff --git a/tp/t/results/indices/printindex_between_part_chapter.pl 
b/tp/t/results/indices/printindex_between_part_chapter.pl
index 6893f8f566..b10ff574e1 100644
--- a/tp/t/results/indices/printindex_between_part_chapter.pl
+++ b/tp/t/results/indices/printindex_between_part_chapter.pl
@@ -16,23 +16,28 @@ $result_trees{'printindex_between_part_chapter'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -48,24 +53,27 @@ $result_trees{'printindex_between_part_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -232,24 +240,27 @@ $result_trees{'printindex_between_part_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Part 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Part 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -304,23 +315,28 @@ $result_trees{'printindex_between_part_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node chap1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node chap1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-chap1'
@@ -335,24 +351,27 @@ $result_trees{'printindex_between_part_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -373,23 +392,28 @@ $result_trees{'printindex_between_part_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node chap2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node chap2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-chap2'
@@ -404,24 +428,27 @@ $result_trees{'printindex_between_part_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -520,13 +547,13 @@ $result_trees{'printindex_between_part_chapter'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[2]{'extra'}{'element_node'}
 = $result_trees{'printindex_between_part_chapter'}{'contents'}[1];
 
$result_trees{'printindex_between_part_chapter'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'printindex_between_part_chapter'}{'contents'}[1];
 
$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'}[5]{'extra'}{'element_node'}
 = $result_trees{'printindex_between_part_chapter'}{'contents'}[1];
 
$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'}[7]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'printindex_between_part_chapter'}{'contents'}[6];
 
$result_trees{'printindex_between_part_chapter'}{'contents'}[7]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'printindex_between_part_chapter'}{'contents'}[6];
+$result_trees{'printindex_between_part_chapter'}{'contents'}[7]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'printindex_between_part_chapter'}{'contents'}[6];
 
 $result_texis{'printindex_between_part_chapter'} = '@node Top
 @top top
diff --git a/tp/t/results/indices/printindex_index_entry_in_copying.pl 
b/tp/t/results/indices/printindex_index_entry_in_copying.pl
index 992a3b1308..edc44b104f 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -564,23 +564,28 @@ $result_trees{'printindex_index_entry_in_copying'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -595,24 +600,27 @@ $result_trees{'printindex_index_entry_in_copying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -761,23 +769,28 @@ $result_trees{'printindex_index_entry_in_copying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -793,24 +806,27 @@ $result_trees{'printindex_index_entry_in_copying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -889,7 +905,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
   'type' => 'document_root'
 };
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'printindex_index_entry_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'printindex_index_entry_in_copying'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'printindex_index_entry_in_copying'} = '@copying
 
diff --git 
a/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl 
b/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
index 29132330e4..f4d6d53959 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
@@ -204,23 +204,28 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -235,24 +240,27 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -401,23 +409,28 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -432,24 +445,27 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -490,7 +506,7 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'printindex_index_entry_in_copying_in_footnote'} = '@copying
 
diff --git 
a/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl 
b/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
index c4e83ad23b..ad70d8b14a 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
@@ -564,23 +564,28 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -595,24 +600,27 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -747,23 +755,28 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -779,24 +792,27 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -861,7 +877,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
   'type' => 'document_root'
 };
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'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 42b421251f..6e5566ef91 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 5f35ed60c0..6000368573 100644
--- a/tp/t/results/indices/same_index_entry_merged_indices.pl
+++ b/tp/t/results/indices/same_index_entry_merged_indices.pl
@@ -56,23 +56,28 @@ $result_trees{'same_index_entry_merged_indices'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -87,19 +92,22 @@ $result_trees{'same_index_entry_merged_indices'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -112,23 +120,28 @@ $result_trees{'same_index_entry_merged_indices'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -144,24 +157,27 @@ $result_trees{'same_index_entry_merged_indices'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -531,8 +547,8 @@ $result_trees{'same_index_entry_merged_indices'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'same_index_entry_merged_indices'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'same_index_entry_merged_indices'}{'contents'}[3];
-$result_trees{'same_index_entry_merged_indices'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'same_index_entry_merged_indices'}{'contents'}[3];
+$result_trees{'same_index_entry_merged_indices'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'same_index_entry_merged_indices'}{'contents'}[3];
+$result_trees{'same_index_entry_merged_indices'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'same_index_entry_merged_indices'}{'contents'}[3];
 
 $result_texis{'same_index_entry_merged_indices'} = '@syncodeindex vr fn
 
diff --git a/tp/t/results/indices/same_only_seealso_seeentry.pl 
b/tp/t/results/indices/same_only_seealso_seeentry.pl
index ee39eae019..2836bf2765 100644
--- a/tp/t/results/indices/same_only_seealso_seeentry.pl
+++ b/tp/t/results/indices/same_only_seealso_seeentry.pl
@@ -16,23 +16,28 @@ $result_trees{'same_only_seealso_seeentry'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'same_only_seealso_seeentry'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'same_only_seealso_seeentry'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -114,24 +127,27 @@ $result_trees{'same_only_seealso_seeentry'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -542,18 +558,18 @@ $result_trees{'same_only_seealso_seeentry'} = {
   ],
   'type' => 'document_root'
 };
-$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'}{'seealso'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'seealso'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'seeentry'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[2];
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[3]{'extra'}{'seealso'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[2];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'seeentry'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[2];
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'extra'}{'seealso'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[2];
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[6]{'extra'}{'seeentry'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'}[2];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'extra'}{'seeentry'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'}[2];
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'extra'}{'seealso'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'}[2];
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[9]{'extra'}{'seeentry'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'contents'}[2];
 
 $result_texis{'same_only_seealso_seeentry'} = '@node Top
 @top top
diff --git a/tp/t/results/indices/same_seealso_seeentry.pl 
b/tp/t/results/indices/same_seealso_seeentry.pl
index 21e8dcf5b1..70bc620cae 100644
--- a/tp/t/results/indices/same_seealso_seeentry.pl
+++ b/tp/t/results/indices/same_seealso_seeentry.pl
@@ -16,23 +16,28 @@ $result_trees{'same_seealso_seeentry'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'same_seealso_seeentry'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'same_seealso_seeentry'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -114,24 +127,27 @@ $result_trees{'same_seealso_seeentry'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -583,19 +599,19 @@ $result_trees{'same_seealso_seeentry'} = {
   ],
   'type' => 'document_root'
 };
-$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'}{'seealso'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'seealso'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'seeentry'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[2];
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[3]{'extra'}{'seealso'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[2];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'seeentry'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[2];
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'extra'}{'seealso'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[2];
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[6]{'extra'}{'seeentry'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'}[2];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'extra'}{'seeentry'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'}[2];
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'extra'}{'seealso'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'}[2];
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[9]{'extra'}{'seeentry'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'contents'}[2];
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
 
 $result_texis{'same_seealso_seeentry'} = '@node Top
 @top top
diff --git a/tp/t/results/indices/seealso_duplicate.pl 
b/tp/t/results/indices/seealso_duplicate.pl
index 51998deb34..eca7f1799c 100644
--- a/tp/t/results/indices/seealso_duplicate.pl
+++ b/tp/t/results/indices/seealso_duplicate.pl
@@ -16,23 +16,28 @@ $result_trees{'seealso_duplicate'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'seealso_duplicate'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -456,17 +464,17 @@ $result_trees{'seealso_duplicate'} = {
   ],
   'type' => 'document_root'
 };
-$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'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[1];
-$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[2] = 
$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[1]{'extra'}{'subentry'};
-$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'seealso_duplicate'}{'contents'}[2];
-$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[3]{'extra'}{'subentry'}{'args'}[0]{'contents'}[2]
 = 
$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[3]{'extra'}{'seealso'};
-$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[3]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[3];
-$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[4] = 
$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[3]{'extra'}{'subentry'};
-$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'seealso_duplicate'}{'contents'}[2];
-$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[10]{'extra'}{'subentry'}{'args'}[0]{'contents'}[2]
 = 
$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[10]{'extra'}{'seeentry'};
-$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[10]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[10];
-$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[11] = 
$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[10]{'extra'}{'subentry'};
+$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'seealso_duplicate'}{'contents'}[2];
+$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[2]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[2];
+$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[3] = 
$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[2]{'extra'}{'subentry'};
+$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'seealso_duplicate'}{'contents'}[2];
+$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[4]{'extra'}{'subentry'}{'args'}[0]{'contents'}[2]
 = 
$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[4]{'extra'}{'seealso'};
+$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[4]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[4];
+$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[5] = 
$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[4]{'extra'}{'subentry'};
+$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'seealso_duplicate'}{'contents'}[2];
+$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[11]{'extra'}{'subentry'}{'args'}[0]{'contents'}[2]
 = 
$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[11]{'extra'}{'seeentry'};
+$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[11]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[11];
+$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[12] = 
$result_trees{'seealso_duplicate'}{'contents'}[2]{'contents'}[11]{'extra'}{'subentry'};
 
 $result_texis{'seealso_duplicate'} = '@node Top
 @node chap
diff --git a/tp/t/results/indices/seeentry.pl b/tp/t/results/indices/seeentry.pl
index ca0fc3e12a..d8cb553ddb 100644
--- a/tp/t/results/indices/seeentry.pl
+++ b/tp/t/results/indices/seeentry.pl
@@ -16,23 +16,28 @@ $result_trees{'seeentry'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,19 +52,22 @@ $result_trees{'seeentry'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -72,23 +80,28 @@ $result_trees{'seeentry'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -104,24 +117,27 @@ $result_trees{'seeentry'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -445,14 +461,14 @@ $result_trees{'seeentry'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'seeentry'}{'contents'}[3];
-$result_trees{'seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'seeentry'} = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'seeentry'}{'contents'}[3];
-$result_trees{'seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'seealso'} = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'seeentry'}{'contents'}[3];
-$result_trees{'seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'seeentry'} = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[2];
+$result_trees{'seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'seeentry'} = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'seeentry'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'seeentry'}{'contents'}[3];
+$result_trees{'seeentry'}{'contents'}[4]{'contents'}[3]{'extra'}{'seealso'} = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'seeentry'}{'contents'}[3];
-$result_trees{'seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'seealso'} = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0];
+$result_trees{'seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'seeentry'} = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[2];
+$result_trees{'seeentry'}{'contents'}[4]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'seeentry'}{'contents'}[3];
+$result_trees{'seeentry'}{'contents'}[4]{'contents'}[6]{'extra'}{'seealso'} = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'}[0];
 
 $result_texis{'seeentry'} = '@node Top
 @top
diff --git a/tp/t/results/indices/sorted_subentries.pl 
b/tp/t/results/indices/sorted_subentries.pl
index 5eb90d865d..5c1649ac25 100644
--- a/tp/t/results/indices/sorted_subentries.pl
+++ b/tp/t/results/indices/sorted_subentries.pl
@@ -16,23 +16,28 @@ $result_trees{'sorted_subentries'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,19 +52,22 @@ $result_trees{'sorted_subentries'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -72,23 +80,28 @@ $result_trees{'sorted_subentries'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter one'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter one'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-one'
@@ -103,24 +116,27 @@ $result_trees{'sorted_subentries'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'one'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'one'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -908,23 +924,28 @@ $result_trees{'sorted_subentries'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter second'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter second'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -940,24 +961,27 @@ $result_trees{'sorted_subentries'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'second'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -1737,72 +1761,72 @@ $result_trees{'sorted_subentries'} = {
   ],
   'type' => 'document_root'
 };
-$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'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[1];
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[2] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[1]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[3]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[3];
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[4] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[3]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[5]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[5];
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[6] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[5]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[7];
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[8] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[10]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[10]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[10]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[10];
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[11] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[10]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[12] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[10]{'extra'}{'subentry'}{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[13];
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[14] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[15]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[2]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[2];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[3] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[2]{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[4];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[5] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[6]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[6];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[7] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[6]{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[8];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[9] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[11]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[11]{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[11]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[11];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[12] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[11]{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[13] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[11]{'extra'}{'subentry'}{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[14]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[14]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[14];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[15] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[14]{'extra'}{'subentry'};
 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[16]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[16]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[16];
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[17] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[16]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[18];
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[19] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[20]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[17]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[17]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[17];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[18] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[17]{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[19]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[19]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[19];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[20] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[19]{'extra'}{'subentry'};
 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[21]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[21]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[21]{'extra'}{'subentry'}{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[21]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[21]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[21]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[21];
-$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'}[6]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[5];
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[0]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[0]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[0]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[0];
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[1] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[0]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[2] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[0]{'extra'}{'subentry'}{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[5];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[22]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[3];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[22]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[22]{'extra'}{'subentry'}{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[22]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[22]{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[22]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[22];
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[23] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[22]{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[24] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[22]{'extra'}{'subentry'}{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[25] = 
$result_trees{'sorted_subentries'}{'contents'}[4]{'contents'}[22]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[5];
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[1]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[1]{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[1]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[1];
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[2] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[1]{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[3] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[1]{'extra'}{'subentry'}{'extra'}{'subentry'};
 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[5];
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[4]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[4];
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[5] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[4]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[5];
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[6]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[6]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[6]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[6];
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[7] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[6]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[8] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[6]{'extra'}{'subentry'}{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[9]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[9];
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[10] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[9]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[5];
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[11]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[11]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[11]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[11];
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[12] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[11]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[13] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[11]{'extra'}{'subentry'}{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[14]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[5];
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[14]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[14]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[14]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[14];
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[15] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[14]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[16] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[14]{'extra'}{'subentry'}{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[17]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[5];
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[17]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[17]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[17]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[17];
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[18] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[17]{'extra'}{'subentry'};
-$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[19] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[17]{'extra'}{'subentry'}{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[5];
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[5]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[5];
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[6] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[5]{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[5];
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[7]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[7]{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[7]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[7];
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[8] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[7]{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[9] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[7]{'extra'}{'subentry'}{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[10]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[10];
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[11] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[10]{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[5];
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[12]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[12]{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[12]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[12];
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[13] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[12]{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[14] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[12]{'extra'}{'subentry'}{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[15]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[5];
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[15]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[15]{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[15]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[15];
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[16] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[15]{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[17] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[15]{'extra'}{'subentry'}{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[18]{'extra'}{'element_node'}
 = $result_trees{'sorted_subentries'}{'contents'}[5];
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[18]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[18]{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[18]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[18];
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[19] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[18]{'extra'}{'subentry'};
+$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[20] = 
$result_trees{'sorted_subentries'}{'contents'}[6]{'contents'}[18]{'extra'}{'subentry'}{'extra'}{'subentry'};
 
 $result_texis{'sorted_subentries'} = '@node Top
 @top
diff --git a/tp/t/results/indices/split_chapter_index.pl 
b/tp/t/results/indices/split_chapter_index.pl
index 97deea90c6..67c7646114 100644
--- a/tp/t/results/indices/split_chapter_index.pl
+++ b/tp/t/results/indices/split_chapter_index.pl
@@ -74,23 +74,28 @@ $result_trees{'split_chapter_index'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -106,24 +111,27 @@ $result_trees{'split_chapter_index'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'split indices'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'split indices'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -304,23 +312,28 @@ $result_trees{'split_chapter_index'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -337,24 +350,27 @@ $result_trees{'split_chapter_index'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'First chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'First chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -839,23 +855,28 @@ $result_trees{'split_chapter_index'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section-1'
@@ -871,24 +892,27 @@ $result_trees{'split_chapter_index'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1099,23 +1123,28 @@ $result_trees{'split_chapter_index'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'subsection-1'
@@ -1131,24 +1160,27 @@ $result_trees{'split_chapter_index'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Subsection 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Subsection 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1237,21 +1269,21 @@ $result_trees{'split_chapter_index'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
+$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[1];
+$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'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'}[5]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[5];
-$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'}[4]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[12]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[5];
+$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[5];
+$result_trees{'split_chapter_index'}{'contents'}[8]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[7];
 
 $result_texis{'split_chapter_index'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/indices/subentries.pl 
b/tp/t/results/indices/subentries.pl
index 61a34ac65f..8ce8263a87 100644
--- a/tp/t/results/indices/subentries.pl
+++ b/tp/t/results/indices/subentries.pl
@@ -16,23 +16,28 @@ $result_trees{'subentries'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,19 +52,22 @@ $result_trees{'subentries'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -72,23 +80,28 @@ $result_trees{'subentries'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -104,24 +117,27 @@ $result_trees{'subentries'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -877,38 +893,38 @@ $result_trees{'subentries'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'subentries'}{'contents'}[3];
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'subentries'}{'contents'}[3];
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[2]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[2];
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[3] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[2]{'extra'}{'subentry'};
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'subentries'}{'contents'}[3];
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'};
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[4];
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[5] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'};
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[6] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'}{'extra'}{'subentry'};
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'subentries'}{'contents'}[3];
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'subentry'}{'extra'}{'subentry'};
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'subentry'};
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[7];
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[8] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'subentry'};
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[9] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'subentry'}{'extra'}{'subentry'};
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[10] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry'};
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'subentries'}{'contents'}[3];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'subentries'}{'contents'}[3];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[3]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[3];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[4] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[3]{'extra'}{'subentry'};
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'subentries'}{'contents'}[3];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[5]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[5]{'extra'}{'subentry'};
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[5]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[5];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[6] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[5]{'extra'}{'subentry'};
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[7] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[5]{'extra'}{'subentry'}{'extra'}{'subentry'};
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'subentries'}{'contents'}[3];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'}{'extra'}{'subentry'};
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'};
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[8];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[9] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'};
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[10] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'}{'extra'}{'subentry'};
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[11] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry'};
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'element_node'}
 = $result_trees{'subentries'}{'contents'}[3];
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[13];
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[14] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'subentry'};
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[15]{'extra'}{'element_node'}
 = $result_trees{'subentries'}{'contents'}[3];
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[15]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[15]{'extra'}{'subentry'};
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[15]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[15];
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[16] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[15]{'extra'}{'subentry'};
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[17] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[15]{'extra'}{'subentry'}{'extra'}{'subentry'};
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'element_node'}
 = $result_trees{'subentries'}{'contents'}[3];
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'subentry'}{'extra'}{'subentry'};
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'subentry'};
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[18];
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[19] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'subentry'};
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[20] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'subentry'}{'extra'}{'subentry'};
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[21] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry'};
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[14]{'extra'}{'element_node'}
 = $result_trees{'subentries'}{'contents'}[3];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[14]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[14];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[15] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[14]{'extra'}{'subentry'};
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[16]{'extra'}{'element_node'}
 = $result_trees{'subentries'}{'contents'}[3];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[16]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[16]{'extra'}{'subentry'};
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[16]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[16];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[17] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[16]{'extra'}{'subentry'};
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[18] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[16]{'extra'}{'subentry'}{'extra'}{'subentry'};
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[19]{'extra'}{'element_node'}
 = $result_trees{'subentries'}{'contents'}[3];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[19]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[19]{'extra'}{'subentry'}{'extra'}{'subentry'};
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[19]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[19]{'extra'}{'subentry'};
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[19]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[19];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[20] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[19]{'extra'}{'subentry'};
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[21] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[19]{'extra'}{'subentry'}{'extra'}{'subentry'};
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[22] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[19]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry'};
 
 $result_texis{'subentries'} = '@node Top
 @top
diff --git a/tp/t/results/indices/subentries_and_comments.pl 
b/tp/t/results/indices/subentries_and_comments.pl
index be55abfe6c..245f9e4933 100644
--- a/tp/t/results/indices/subentries_and_comments.pl
+++ b/tp/t/results/indices/subentries_and_comments.pl
@@ -16,23 +16,28 @@ $result_trees{'subentries_and_comments'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,19 +52,22 @@ $result_trees{'subentries_and_comments'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -72,23 +80,28 @@ $result_trees{'subentries_and_comments'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter one'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter one'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -104,24 +117,27 @@ $result_trees{'subentries_and_comments'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'one'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'one'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -329,12 +345,12 @@ $result_trees{'subentries_and_comments'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'subentries_and_comments'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'subentries_and_comments'}{'contents'}[3];
-$result_trees{'subentries_and_comments'}{'contents'}[4]{'contents'}[1]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'subentries_and_comments'}{'contents'}[4]{'contents'}[1];
-$result_trees{'subentries_and_comments'}{'contents'}[4]{'contents'}[2] = 
$result_trees{'subentries_and_comments'}{'contents'}[4]{'contents'}[1]{'extra'}{'subentry'};
-$result_trees{'subentries_and_comments'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'subentries_and_comments'}{'contents'}[3];
-$result_trees{'subentries_and_comments'}{'contents'}[4]{'contents'}[3]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'subentries_and_comments'}{'contents'}[4]{'contents'}[3];
-$result_trees{'subentries_and_comments'}{'contents'}[4]{'contents'}[4] = 
$result_trees{'subentries_and_comments'}{'contents'}[4]{'contents'}[3]{'extra'}{'subentry'};
+$result_trees{'subentries_and_comments'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'subentries_and_comments'}{'contents'}[3];
+$result_trees{'subentries_and_comments'}{'contents'}[4]{'contents'}[2]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'subentries_and_comments'}{'contents'}[4]{'contents'}[2];
+$result_trees{'subentries_and_comments'}{'contents'}[4]{'contents'}[3] = 
$result_trees{'subentries_and_comments'}{'contents'}[4]{'contents'}[2]{'extra'}{'subentry'};
+$result_trees{'subentries_and_comments'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'subentries_and_comments'}{'contents'}[3];
+$result_trees{'subentries_and_comments'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'subentries_and_comments'}{'contents'}[4]{'contents'}[4];
+$result_trees{'subentries_and_comments'}{'contents'}[4]{'contents'}[5] = 
$result_trees{'subentries_and_comments'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'};
 
 $result_texis{'subentries_and_comments'} = '@node Top
 @top
diff --git a/tp/t/results/indices/subentry_and_sortas.pl 
b/tp/t/results/indices/subentry_and_sortas.pl
index 8eb282a18d..9a0602b9e0 100644
--- a/tp/t/results/indices/subentry_and_sortas.pl
+++ b/tp/t/results/indices/subentry_and_sortas.pl
@@ -16,23 +16,28 @@ $result_trees{'subentry_and_sortas'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,19 +52,22 @@ $result_trees{'subentry_and_sortas'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -72,23 +80,28 @@ $result_trees{'subentry_and_sortas'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -104,24 +117,27 @@ $result_trees{'subentry_and_sortas'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -435,12 +451,12 @@ $result_trees{'subentry_and_sortas'} = {
   ],
   'type' => 'document_root'
 };
-$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'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1];
-$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[2] = 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1]{'extra'}{'subentry'};
-$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'subentry_and_sortas'}{'contents'}[3];
-$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4];
-$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[5] = 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'};
+$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'subentry_and_sortas'}{'contents'}[3];
+$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[2]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[2];
+$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[3] = 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[2]{'extra'}{'subentry'};
+$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'subentry_and_sortas'}{'contents'}[3];
+$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[5]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[5];
+$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[6] = 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[5]{'extra'}{'subentry'};
 
 $result_texis{'subentry_and_sortas'} = '@node Top
 @top
diff --git a/tp/t/results/indices/subentry_and_sortas_spaces.pl 
b/tp/t/results/indices/subentry_and_sortas_spaces.pl
index 283366bc65..900964d5b1 100644
--- a/tp/t/results/indices/subentry_and_sortas_spaces.pl
+++ b/tp/t/results/indices/subentry_and_sortas_spaces.pl
@@ -16,23 +16,28 @@ $result_trees{'subentry_and_sortas_spaces'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,19 +52,22 @@ $result_trees{'subentry_and_sortas_spaces'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -72,23 +80,28 @@ $result_trees{'subentry_and_sortas_spaces'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -104,24 +117,27 @@ $result_trees{'subentry_and_sortas_spaces'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -559,22 +575,22 @@ $result_trees{'subentry_and_sortas_spaces'} = {
   ],
   'type' => 'document_root'
 };
-$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'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[1];
-$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[2] = 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[1]{'extra'}{'subentry'};
-$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'subentry_and_sortas_spaces'}{'contents'}[3];
-$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[3]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[3];
-$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[4] = 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[3]{'extra'}{'subentry'};
-$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'subentry_and_sortas_spaces'}{'contents'}[3];
-$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[5]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[5]{'extra'}{'subentry'};
-$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[5]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[5];
-$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[6] = 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[5]{'extra'}{'subentry'};
-$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[7] = 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[5]{'extra'}{'subentry'}{'extra'}{'subentry'};
-$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'subentry_and_sortas_spaces'}{'contents'}[3];
-$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'};
-$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[8];
-$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[9] = 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'};
-$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[10] = 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'}{'extra'}{'subentry'};
+$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'subentry_and_sortas_spaces'}{'contents'}[3];
+$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[2]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[2];
+$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[3] = 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[2]{'extra'}{'subentry'};
+$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'subentry_and_sortas_spaces'}{'contents'}[3];
+$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[4];
+$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[5] = 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'};
+$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'subentry_and_sortas_spaces'}{'contents'}[3];
+$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[6]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[6]{'extra'}{'subentry'};
+$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[6]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[6];
+$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[7] = 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[6]{'extra'}{'subentry'};
+$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[8] = 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[6]{'extra'}{'subentry'}{'extra'}{'subentry'};
+$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'subentry_and_sortas_spaces'}{'contents'}[3];
+$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[9]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[9]{'extra'}{'subentry'};
+$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[9]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[9];
+$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[10] = 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[9]{'extra'}{'subentry'};
+$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[11] = 
$result_trees{'subentry_and_sortas_spaces'}{'contents'}[4]{'contents'}[9]{'extra'}{'subentry'}{'extra'}{'subentry'};
 
 $result_texis{'subentry_and_sortas_spaces'} = '@node Top
 @top
diff --git a/tp/t/results/indices/syncode_index_print_both.pl 
b/tp/t/results/indices/syncode_index_print_both.pl
index 95aa9397ca..d2608608b2 100644
--- a/tp/t/results/indices/syncode_index_print_both.pl
+++ b/tp/t/results/indices/syncode_index_print_both.pl
@@ -56,23 +56,28 @@ $result_trees{'syncode_index_print_both'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -87,24 +92,27 @@ $result_trees{'syncode_index_print_both'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -122,23 +130,28 @@ $result_trees{'syncode_index_print_both'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -154,24 +167,27 @@ $result_trees{'syncode_index_print_both'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -377,8 +393,8 @@ $result_trees{'syncode_index_print_both'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[2]{'extra'}{'element_node'}
 = $result_trees{'syncode_index_print_both'}{'contents'}[3];
+$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'syncode_index_print_both'}{'contents'}[3];
 
 $result_texis{'syncode_index_print_both'} = '@syncodeindex fn cp
 
diff --git a/tp/t/results/indices/syncodeindex_to_plain.pl 
b/tp/t/results/indices/syncodeindex_to_plain.pl
index 716bc99abe..32dcf41524 100644
--- a/tp/t/results/indices/syncodeindex_to_plain.pl
+++ b/tp/t/results/indices/syncodeindex_to_plain.pl
@@ -56,23 +56,28 @@ $result_trees{'syncodeindex_to_plain'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -87,24 +92,27 @@ $result_trees{'syncodeindex_to_plain'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -328,9 +336,9 @@ $result_trees{'syncodeindex_to_plain'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[2]{'extra'}{'element_node'}
 = $result_trees{'syncodeindex_to_plain'}{'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'}[4]{'extra'}{'element_node'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[2];
 
 $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 45fe055ae6..7059708bdd 100644
--- a/tp/t/results/indices/transparent_sort_chars.pl
+++ b/tp/t/results/indices/transparent_sort_chars.pl
@@ -40,23 +40,28 @@ $result_trees{'transparent_sort_chars'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -71,19 +76,22 @@ $result_trees{'transparent_sort_chars'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -96,24 +104,27 @@ $result_trees{'transparent_sort_chars'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -317,9 +328,9 @@ $result_trees{'transparent_sort_chars'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[2]{'extra'}{'element_node'}
 = $result_trees{'transparent_sort_chars'}{'contents'}[3];
 
$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'}[4]{'extra'}{'element_node'}
 = $result_trees{'transparent_sort_chars'}{'contents'}[3];
 
 $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 bc78d32e93..a029d5b369 100644
Binary files a/tp/t/results/indices/w_lines_count.pl and 
b/tp/t/results/indices/w_lines_count.pl differ
diff --git a/tp/t/results/info_tests/anchor_and_spaces.pl 
b/tp/t/results/info_tests/anchor_and_spaces.pl
index b3dea6c040..f67b395b32 100644
--- a/tp/t/results/info_tests/anchor_and_spaces.pl
+++ b/tp/t/results/info_tests/anchor_and_spaces.pl
@@ -11,23 +11,28 @@ $result_trees{'anchor_and_spaces'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'anchor_and_spaces'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Element'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Element'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'anchor',
           'contents' => [
diff --git a/tp/t/results/info_tests/anchor_in_command.pl 
b/tp/t/results/info_tests/anchor_in_command.pl
index 6d74eee86d..039a9d9e5d 100644
--- a/tp/t/results/info_tests/anchor_in_command.pl
+++ b/tp/t/results/info_tests/anchor_in_command.pl
@@ -11,24 +11,27 @@ $result_trees{'anchor_in_command'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 4efb6c3f7c..e931b66608 100644
--- a/tp/t/results/info_tests/before_node_and_section.pl
+++ b/tp/t/results/info_tests/before_node_and_section.pl
@@ -252,23 +252,28 @@ $result_trees{'before_node_and_section'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -283,30 +288,33 @@ $result_trees{'before_node_and_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top '
-            },
-            {
-              'cmdname' => '@'
-            },
-            {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top '
+                },
+                {
+                  'cmdname' => '@'
+                },
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -503,23 +511,28 @@ $result_trees{'before_node_and_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -535,24 +548,27 @@ $result_trees{'before_node_and_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node1 chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node1 chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -613,8 +629,8 @@ $result_trees{'before_node_and_section'} = {
 };
 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[0];
-$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[3]{'contents'}[5]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[3]{'contents'}[5]{'contents'}[0]{'contents'}[0];
+$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'before_node_and_section'} = 'Garbage
 ref to Top @ref{Top}.
diff --git a/tp/t/results/info_tests/chinese_mixed_with_en_EUC_CN.pl 
b/tp/t/results/info_tests/chinese_mixed_with_en_EUC_CN.pl
index 7c860b0f43..943ff0e4c3 100644
--- a/tp/t/results/info_tests/chinese_mixed_with_en_EUC_CN.pl
+++ b/tp/t/results/info_tests/chinese_mixed_with_en_EUC_CN.pl
@@ -93,23 +93,28 @@ $result_trees{'chinese_mixed_with_en_EUC_CN'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -125,24 +130,27 @@ $result_trees{'chinese_mixed_with_en_EUC_CN'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Mixed chinese and english'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Mixed chinese and english'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -175,23 +183,28 @@ $result_trees{'chinese_mixed_with_en_EUC_CN'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Mixed english and chinese'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Mixed english and chinese'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Mixed-english-and-chinese'
@@ -207,24 +220,27 @@ $result_trees{'chinese_mixed_with_en_EUC_CN'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Mixed english and chinese'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Mixed english and chinese'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 71ca4ef5f7..2ade8dcc05 100644
--- a/tp/t/results/info_tests/colon_in_index_entry.pl
+++ b/tp/t/results/info_tests/colon_in_index_entry.pl
@@ -11,24 +11,27 @@ $result_trees{'colon_in_index_entry'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -572,11 +575,11 @@ $result_trees{'colon_in_index_entry'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'colon_in_index_entry'}{'contents'}[1];
-$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'colon_in_index_entry'}{'contents'}[1];
-$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'colon_in_index_entry'}{'contents'}[1];
-$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'}[4]{'extra'}{'element_node'}
 = $result_trees{'colon_in_index_entry'}{'contents'}[1];
+$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'colon_in_index_entry'}{'contents'}[1];
+$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[6]{'extra'}{'command_as_argument'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'colon_in_index_entry'}{'contents'}[1];
+$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'colon_in_index_entry'}{'contents'}[1];
 
 $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 8e224f6b96..5941b32b7f 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
@@ -16,24 +16,27 @@ $result_trees{'colons_in_index_entries_and_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -240,57 +243,60 @@ $result_trees{'colons_in_index_entries_and_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'One'
-            },
-            {
-              'cmdname' => 'asis',
               'contents' => [
                 {
+                  'text' => 'One'
+                },
+                {
+                  'cmdname' => 'asis',
                   'contents' => [
                     {
-                      'text' => '::'
+                      'contents' => [
+                        {
+                          'text' => '::'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 8
-              }
-            },
-            {
-              'text' => 'node'
-            },
-            {
-              'cmdname' => 'comma',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 8
+                  }
+                },
+                {
+                  'text' => 'node'
+                },
+                {
+                  'cmdname' => 'comma',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 8
+                  }
+                },
                 {
-                  'type' => 'brace_container'
+                  'text' => ' with entries.'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 8
-              }
-            },
-            {
-              'text' => ' with entries.'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -617,24 +623,27 @@ $result_trees{'colons_in_index_entries_and_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Concept Index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Concept Index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -695,18 +704,18 @@ $result_trees{'colons_in_index_entries_and_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[4];
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[8]{'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'}{'element_node'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
 
 $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 be14154b96..cbe94d9d17 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
@@ -16,24 +16,27 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -240,57 +243,60 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'One'
-            },
-            {
-              'cmdname' => 'asis',
               'contents' => [
                 {
+                  'text' => 'One'
+                },
+                {
+                  'cmdname' => 'asis',
                   'contents' => [
                     {
-                      'text' => '::'
+                      'contents' => [
+                        {
+                          'text' => '::'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 8
-              }
-            },
-            {
-              'text' => 'node'
-            },
-            {
-              'cmdname' => 'comma',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 8
+                  }
+                },
+                {
+                  'text' => 'node'
+                },
+                {
+                  'cmdname' => 'comma',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 8
+                  }
+                },
                 {
-                  'type' => 'brace_container'
+                  'text' => ' with entries.'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 8
-              }
-            },
-            {
-              'text' => ' with entries.'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -617,24 +623,27 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Concept Index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Concept Index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -695,18 +704,18 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2];
+$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[4];
+$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[3]{'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'}[7]{'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'}[4]{'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'}[8]{'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'}{'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'}[10]{'extra'}{'element_node'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2];
 
 $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 472031545a..37fe0bd624 100644
--- a/tp/t/results/info_tests/def_in_copying.pl
+++ b/tp/t/results/info_tests/def_in_copying.pl
@@ -89,23 +89,28 @@ $result_trees{'def_in_copying'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -121,24 +126,27 @@ $result_trees{'def_in_copying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Test for definition commands'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Test for definition commands'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -808,8 +816,8 @@ $result_trees{'def_in_copying'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'def_in_copying'}{'contents'}[1];
-$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'def_in_copying'}{'contents'}[1];
+$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'def_in_copying'}{'contents'}[1];
+$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'def_in_copying'}{'contents'}[1];
 
 $result_texis{'def_in_copying'} = '@macro mymacro
 @deffn aa bb cc
diff --git a/tp/t/results/info_tests/direntry_dircategory.pl 
b/tp/t/results/info_tests/direntry_dircategory.pl
index 69c43e0d30..2ba04ffe81 100644
--- a/tp/t/results/info_tests/direntry_dircategory.pl
+++ b/tp/t/results/info_tests/direntry_dircategory.pl
@@ -432,23 +432,28 @@ $result_trees{'direntry_dircategory'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -464,24 +469,27 @@ $result_trees{'direntry_dircategory'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Test dircategory and direntry'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Test dircategory and direntry'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -766,23 +774,28 @@ $result_trees{'direntry_dircategory'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -798,24 +811,27 @@ $result_trees{'direntry_dircategory'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -865,8 +881,8 @@ $result_trees{'direntry_dircategory'} = {
 
$result_trees{'direntry_dircategory'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'direntry_dircategory'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'direntry_dircategory'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'direntry_dircategory'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'direntry_dircategory'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'direntry_dircategory'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'direntry_dircategory'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'direntry_dircategory'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1];
-$result_trees{'direntry_dircategory'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'direntry_dircategory'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'direntry_dircategory'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'direntry_dircategory'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[3]{'contents'}[1];
+$result_trees{'direntry_dircategory'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'direntry_dircategory'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'direntry_dircategory'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/info_tests/direntry_dircategory_and_commands.pl 
b/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
index 95351d6bb4..b69fbb531d 100644
--- a/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
+++ b/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
@@ -361,23 +361,28 @@ $result_trees{'direntry_dircategory_and_commands'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -392,24 +397,27 @@ $result_trees{'direntry_dircategory_and_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Test dircategory and direntry'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Test dircategory and direntry'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/info_tests/empty_caption.pl 
b/tp/t/results/info_tests/empty_caption.pl
index 101c7592f9..4c66285948 100644
--- a/tp/t/results/info_tests/empty_caption.pl
+++ b/tp/t/results/info_tests/empty_caption.pl
@@ -18,24 +18,27 @@ $result_trees{'empty_caption'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -197,8 +200,8 @@ $result_trees{'empty_caption'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'empty_caption'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'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'}[2];
+$result_trees{'empty_caption'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'extra'}{'float'}
 = $result_trees{'empty_caption'}{'contents'}[1]{'contents'}[2];
+$result_trees{'empty_caption'}{'contents'}[1]{'contents'}[2]{'extra'}{'caption'}
 = $result_trees{'empty_caption'}{'contents'}[1]{'contents'}[2]{'contents'}[2];
 
 $result_texis{'empty_caption'} = '
 @node Top
diff --git a/tp/t/results/info_tests/encoding_us_ascii.pl 
b/tp/t/results/info_tests/encoding_us_ascii.pl
index fa071fcf3f..61495084ac 100644
--- a/tp/t/results/info_tests/encoding_us_ascii.pl
+++ b/tp/t/results/info_tests/encoding_us_ascii.pl
@@ -54,24 +54,27 @@ $result_trees{'encoding_us_ascii'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 383435105b..c57c89db48 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
@@ -16,23 +16,28 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -247,35 +255,40 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap '
-            },
-            {
-              'cmdname' => '*'
-            },
-            {
-              'text' => ' f     nl Something? '
-            },
-            {
-              'cmdname' => '*'
-            },
-            {
-              'text' => ' After punct'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap '
+                },
+                {
+                  'cmdname' => '*'
+                },
+                {
+                  'text' => ' f     nl Something? '
+                },
+                {
+                  'cmdname' => '*'
+                },
+                {
+                  'text' => ' After punct'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -291,24 +304,27 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -474,23 +490,28 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'new n'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'new n'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'new-n'
@@ -505,24 +526,27 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Ochap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Ochap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -951,31 +975,31 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$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'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'contents'}[0];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'contents'}[1];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'contents'}[2];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[3]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[3]{'contents'}[3]{'contents'}[0];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[4];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'end_of_line_command_in_node_lines'}{'contents'}[3];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[8]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[8]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[8]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[8]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[8]{'contents'}[2]{'contents'}[3]{'contents'}[0];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[8]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[8]{'contents'}[2]{'contents'}[3]{'contents'}[1];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[8]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[8]{'contents'}[2]{'contents'}[3]{'contents'}[2];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[8]{'contents'}[3]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[8]{'contents'}[3]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'end_of_line_command_in_node_lines'} = '@node Top
 @top top
diff --git a/tp/t/results/info_tests/error_in_footnote.pl 
b/tp/t/results/info_tests/error_in_footnote.pl
index 190bd21d63..4d2aa28c40 100644
--- a/tp/t/results/info_tests/error_in_footnote.pl
+++ b/tp/t/results/info_tests/error_in_footnote.pl
@@ -18,24 +18,27 @@ $result_trees{'error_in_footnote'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -342,8 +345,8 @@ $result_trees{'error_in_footnote'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'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'}[4];
+$result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'extra'}{'float'}
 = $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[2];
+$result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[2]{'extra'}{'caption'}
 = 
$result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[2]{'contents'}[4];
 
 $result_texis{'error_in_footnote'} = '
 @node Top
diff --git a/tp/t/results/info_tests/file_only_png.pl 
b/tp/t/results/info_tests/file_only_png.pl
index 2fcf505415..1739d8561d 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 8c3d7f14ce..e9496b39b1 100644
--- a/tp/t/results/info_tests/float_long_captions.pl
+++ b/tp/t/results/info_tests/float_long_captions.pl
@@ -11,24 +11,27 @@ $result_trees{'float_long_captions'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -307,10 +310,10 @@ $result_trees{'float_long_captions'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'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'}[1];
-$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'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'}[1];
+$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'float'}
 = $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[2];
+$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[2]{'extra'}{'caption'}
 = 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[2]{'contents'}[1];
+$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'float'}
 = $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[4];
+$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[4]{'extra'}{'caption'}
 = 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[4]{'contents'}[1];
 
 $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 86e6d4d373..1bf8e64faf 100644
--- a/tp/t/results/info_tests/float_without_type.pl
+++ b/tp/t/results/info_tests/float_without_type.pl
@@ -18,24 +18,27 @@ $result_trees{'float_without_type'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/info_tests/image_and_punctuation.pl 
b/tp/t/results/info_tests/image_and_punctuation.pl
index 51fcfed794..6342bb40f6 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 d8b8c1cdcf..76385ae4a6 100644
--- a/tp/t/results/info_tests/image_and_spaces_formatting.pl
+++ b/tp/t/results/info_tests/image_and_spaces_formatting.pl
@@ -11,24 +11,27 @@ $result_trees{'image_and_spaces_formatting'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/info_tests/image_extension.pl 
b/tp/t/results/info_tests/image_extension.pl
index bbb3fb62ff..aa4273f88a 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 1239f86964..4f163ffdef 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 0d1ab96f9e..6abfa01c35 100644
--- a/tp/t/results/info_tests/image_not_found.pl
+++ b/tp/t/results/info_tests/image_not_found.pl
@@ -11,24 +11,27 @@ $result_trees{'image_not_found'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'image',
           'contents' => [
diff --git a/tp/t/results/info_tests/image_quotes.pl 
b/tp/t/results/info_tests/image_quotes.pl
index cb006327fd..905fa4f35b 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 502da9e5d7..64aff9a459 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 d1836d1b1a..fa5faac0b0 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
@@ -11,23 +11,28 @@ $result_trees{'index_entry_at_end_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'index_entry_at_end_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Element'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Element'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -231,23 +239,28 @@ $result_trees{'index_entry_at_end_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -262,24 +275,27 @@ $result_trees{'index_entry_at_end_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -350,23 +366,28 @@ $result_trees{'index_entry_at_end_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'indices'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'indices'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -382,24 +403,27 @@ $result_trees{'index_entry_at_end_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'indices'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'indices'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -453,9 +477,9 @@ $result_trees{'index_entry_at_end_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'index_entry_at_end_node'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'index_entry_at_end_node'}{'contents'}[3];
+$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'index_entry_at_end_node'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'index_entry_at_end_node'}{'contents'}[3];
 
 $result_texis{'index_entry_at_end_node'} = '@node Top
 @top Element
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 65c2166163..173a89adb6 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
@@ -18,24 +18,27 @@ $result_trees{'invalid_node_name_no_warning'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -318,37 +321,40 @@ $result_trees{'invalid_node_name_no_warning'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'asis',
               'contents' => [
                 {
+                  'cmdname' => 'asis',
                   'contents' => [
                     {
-                      'text' => 'nodename. a'
+                      'contents' => [
+                        {
+                          'text' => 'nodename. a'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 10
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 10
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -369,38 +375,41 @@ $result_trees{'invalid_node_name_no_warning'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node'
-            },
-            {
-              'cmdname' => 'comma',
               'contents' => [
                 {
-                  'type' => 'brace_container'
+                  'text' => 'node'
+                },
+                {
+                  'cmdname' => 'comma',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 12
+                  }
+                },
+                {
+                  'text' => 'comma'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 12
-              }
-            },
-            {
-              'text' => 'comma'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -421,37 +430,40 @@ $result_trees{'invalid_node_name_no_warning'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'asis',
               'contents' => [
                 {
+                  'cmdname' => 'asis',
                   'contents' => [
                     {
-                      'text' => 'bidule:'
+                      'contents' => [
+                        {
+                          'text' => 'bidule:'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 14
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 14
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -643,17 +655,17 @@ $result_trees{'invalid_node_name_no_warning'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[0];
-$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[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'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[0];
-$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1];
-$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[2];
-$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1];
-$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[2];
-$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0];
+$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[0];
+$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1];
+$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[0];
+$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1];
+$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[2];
+$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1];
+$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[2];
+$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'invalid_node_name_no_warning'} = '
 @node Top
diff --git a/tp/t/results/info_tests/invalid_node_name_warning.pl 
b/tp/t/results/info_tests/invalid_node_name_warning.pl
index be7f27e456..5464be217b 100644
--- a/tp/t/results/info_tests/invalid_node_name_warning.pl
+++ b/tp/t/results/info_tests/invalid_node_name_warning.pl
@@ -18,24 +18,27 @@ $result_trees{'invalid_node_name_warning'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -318,37 +321,40 @@ $result_trees{'invalid_node_name_warning'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'asis',
               'contents' => [
                 {
+                  'cmdname' => 'asis',
                   'contents' => [
                     {
-                      'text' => 'nodename. a'
+                      'contents' => [
+                        {
+                          'text' => 'nodename. a'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 10
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 10
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -369,38 +375,41 @@ $result_trees{'invalid_node_name_warning'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node'
-            },
-            {
-              'cmdname' => 'comma',
               'contents' => [
                 {
-                  'type' => 'brace_container'
+                  'text' => 'node'
+                },
+                {
+                  'cmdname' => 'comma',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 12
+                  }
+                },
+                {
+                  'text' => 'comma'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 12
-              }
-            },
-            {
-              'text' => 'comma'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -421,37 +430,40 @@ $result_trees{'invalid_node_name_warning'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'asis',
               'contents' => [
                 {
+                  'cmdname' => 'asis',
                   'contents' => [
                     {
-                      'text' => 'bidule:'
+                      'contents' => [
+                        {
+                          'text' => 'bidule:'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 14
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 14
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -643,17 +655,17 @@ $result_trees{'invalid_node_name_warning'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[0];
-$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[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'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[0];
-$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1];
-$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[2];
-$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1];
-$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[2];
-$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0];
+$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[0];
+$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1];
+$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[0];
+$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1];
+$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[2];
+$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1];
+$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[2];
+$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'invalid_node_name_warning'} = '
 @node Top
diff --git a/tp/t/results/info_tests/known_encoding.pl 
b/tp/t/results/info_tests/known_encoding.pl
index d7e4f0f262..8c41ba8b73 100644
--- a/tp/t/results/info_tests/known_encoding.pl
+++ b/tp/t/results/info_tests/known_encoding.pl
@@ -54,24 +54,27 @@ $result_trees{'known_encoding'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 6a4424843a..232f704dc7 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
@@ -11,24 +11,27 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -868,11 +871,11 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1];
-$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'columnfractions'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'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'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1];
+$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[2]{'extra'}{'columnfractions'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'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'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[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 77fffc76ce..d1dba64c35 100644
--- a/tp/t/results/info_tests/nested_footnotes_separate.pl
+++ b/tp/t/results/info_tests/nested_footnotes_separate.pl
@@ -45,24 +45,27 @@ $result_trees{'nested_footnotes_separate'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 c07c430ec4..cc02f33f9b 100644
--- a/tp/t/results/info_tests/nested_multitable_anchor_index.pl
+++ b/tp/t/results/info_tests/nested_multitable_anchor_index.pl
@@ -11,24 +11,27 @@ $result_trees{'nested_multitable_anchor_index'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -621,10 +624,10 @@ $result_trees{'nested_multitable_anchor_index'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1];
-$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1];
-$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1];
+$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1];
+$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'nested_multitable_anchor_index'} = '@node Top
 
diff --git a/tp/t/results/info_tests/no_node_but_top.pl 
b/tp/t/results/info_tests/no_node_but_top.pl
index 3714e8b8a6..c981650279 100644
--- a/tp/t/results/info_tests/no_node_but_top.pl
+++ b/tp/t/results/info_tests/no_node_but_top.pl
@@ -11,23 +11,28 @@ $result_trees{'no_node_but_top'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'top',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
diff --git a/tp/t/results/info_tests/no_top_node.pl 
b/tp/t/results/info_tests/no_top_node.pl
index 0f4d32a9f3..e90001d7f0 100644
--- a/tp/t/results/info_tests/no_top_node.pl
+++ b/tp/t/results/info_tests/no_top_node.pl
@@ -11,23 +11,28 @@ $result_trees{'no_top_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node Top not Top node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node Top not Top node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-Top-not-Top-node'
diff --git a/tp/t/results/info_tests/note_in_strong.pl 
b/tp/t/results/info_tests/note_in_strong.pl
index 7ad28f4148..00a01e6cbf 100644
--- a/tp/t/results/info_tests/note_in_strong.pl
+++ b/tp/t/results/info_tests/note_in_strong.pl
@@ -11,24 +11,27 @@ $result_trees{'note_in_strong'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 caa82a4f4a..b55c5d27f4 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
@@ -11,24 +11,27 @@ $result_trees{'note_in_strong_end_of_line'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/info_tests/novalidate_empty_refs.pl 
b/tp/t/results/info_tests/novalidate_empty_refs.pl
index 9349930c1d..4ae2da6b5b 100644
--- a/tp/t/results/info_tests/novalidate_empty_refs.pl
+++ b/tp/t/results/info_tests/novalidate_empty_refs.pl
@@ -36,24 +36,27 @@ $result_trees{'novalidate_empty_refs'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -152,18 +155,23 @@ $result_trees{'novalidate_empty_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => '
+              'contents' => [
+                {
+                  'cmdname' => '
 '
+                }
+              ],
+              'type' => 'line_arg'
             }
           ],
-          'type' => 'line_arg'
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'info' => {
         'spaces_before_argument' => {
           'text' => ' '
@@ -174,23 +182,28 @@ $result_trees{'novalidate_empty_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => ':'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'cmdname' => ':'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'info' => {
         'spaces_before_argument' => {
           'text' => ' '
@@ -201,36 +214,41 @@ $result_trees{'novalidate_empty_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'asis',
               'contents' => [
                 {
+                  'cmdname' => 'asis',
                   'contents' => [
                     {
-                      'text' => ' '
+                      'contents' => [
+                        {
+                          'text' => ' '
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 11
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 11
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'info' => {
         'spaces_before_argument' => {
           'text' => ' '
@@ -243,8 +261,8 @@ $result_trees{'novalidate_empty_refs'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'novalidate_empty_refs'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'novalidate_empty_refs'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'novalidate_empty_refs'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'novalidate_empty_refs'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'novalidate_empty_refs'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'novalidate_empty_refs'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'novalidate_empty_refs'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'novalidate_empty_refs'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'novalidate_empty_refs'} = '
 @novalidate
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 fa82b80f31..b71a29f8e7 100644
--- a/tp/t/results/info_tests/one_node_counted_elements.pl
+++ b/tp/t/results/info_tests/one_node_counted_elements.pl
@@ -62,51 +62,54 @@ $result_trees{'one_node_counted_elements'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'one node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
+              'contents' => [
+                {
+                  'text' => 'one node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
             {
-              'text' => '('
+              'type' => 'line_arg'
             },
             {
-              'text' => 'dir'
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -412,10 +415,10 @@ $result_trees{'one_node_counted_elements'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'one_node_counted_elements'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'one_node_counted_elements'}{'contents'}[1];
-$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'one_node_counted_elements'}{'contents'}[1];
+$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'one_node_counted_elements'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'one_node_counted_elements'} = 'Garbage
 @cindex before nodes
diff --git a/tp/t/results/info_tests/paragraphindent_and_preamble.pl 
b/tp/t/results/info_tests/paragraphindent_and_preamble.pl
index fa81c81cdb..f2f0f833ab 100644
--- a/tp/t/results/info_tests/paragraphindent_and_preamble.pl
+++ b/tp/t/results/info_tests/paragraphindent_and_preamble.pl
@@ -149,23 +149,28 @@ $result_trees{'paragraphindent_and_preamble'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -180,30 +185,33 @@ $result_trees{'paragraphindent_and_preamble'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'test '
-            },
-            {
-              'cmdname' => '@'
-            },
-            {
-              'text' => 'paragraphindent in preamble effect in preamble'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'test '
+                },
+                {
+                  'cmdname' => '@'
+                },
+                {
+                  'text' => 'paragraphindent in preamble effect in preamble'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 bc1f53c0f5..14ec31847e 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
@@ -149,23 +149,28 @@ 
$result_trees{'paragraphindent_in_preamble_and_in_document'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -180,30 +185,33 @@ 
$result_trees{'paragraphindent_in_preamble_and_in_document'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'test '
-            },
-            {
-              'cmdname' => '@'
-            },
-            {
-              'text' => 'paragraphindent in preamble effect in preamble'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'test '
+                },
+                {
+                  'cmdname' => '@'
+                },
+                {
+                  'text' => 'paragraphindent in preamble effect in preamble'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 2ef59b0a0a..7f22577fdc 100644
--- a/tp/t/results/info_tests/paragraphindent_not_in_preamble.pl
+++ b/tp/t/results/info_tests/paragraphindent_not_in_preamble.pl
@@ -98,23 +98,28 @@ $result_trees{'paragraphindent_not_in_preamble'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -129,30 +134,33 @@ $result_trees{'paragraphindent_not_in_preamble'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'test '
-            },
-            {
-              'cmdname' => '@'
-            },
-            {
-              'text' => 'paragraphindent effect in preamble'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'test '
+                },
+                {
+                  'cmdname' => '@'
+                },
+                {
+                  'text' => 'paragraphindent effect in preamble'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/info_tests/pxref_test.pl 
b/tp/t/results/info_tests/pxref_test.pl
index 7b4b9e4018..06b0d5c1c9 100644
--- a/tp/t/results/info_tests/pxref_test.pl
+++ b/tp/t/results/info_tests/pxref_test.pl
@@ -11,24 +11,27 @@ $result_trees{'pxref_test'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -259,14 +262,14 @@ $result_trees{'pxref_test'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[4];
-$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1];
-$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[4];
-$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[1];
-$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[4];
-$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[1];
-$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[4];
+$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1];
+$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[4];
+$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1];
+$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[4];
+$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1];
+$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[4];
+$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[7]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[1];
+$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[7]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'pxref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[4];
 
 $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 9fcb57a65a..f636fca902 100644
--- a/tp/t/results/info_tests/quote_node_names_info.pl
+++ b/tp/t/results/info_tests/quote_node_names_info.pl
@@ -16,23 +16,28 @@ $result_trees{'quote_node_names_info'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -48,19 +53,22 @@ $result_trees{'quote_node_names_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1414,23 +1422,28 @@ $result_trees{'quote_node_names_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'blah:blah'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'blah:blah'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'blah_003ablah'
@@ -1446,24 +1459,27 @@ $result_trees{'quote_node_names_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'blah:blah'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'blah:blah'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1498,23 +1514,28 @@ $result_trees{'quote_node_names_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'blumpty.fump'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'blumpty.fump'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'blumpty_002efump'
@@ -1530,24 +1551,27 @@ $result_trees{'quote_node_names_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'blumpty.fump'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'blumpty.fump'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1568,160 +1592,165 @@ $result_trees{'quote_node_names_info'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'normal node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '('
-            },
-            {
-              'text' => 'man'
-            },
-            {
-              'cmdname' => 'comma',
               'contents' => [
                 {
-                  'type' => 'brace_container'
+                  'text' => 'normal node'
                 }
               ],
-              'source_info' => {
-                'file_name' => 'nodequote.texi',
-                'line_nr' => 50
-              }
-            },
-            {
-              'text' => 'u:a.l'
-            },
-            {
-              'text' => ')'
-            },
-            {
-              'text' => 'direction'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
-              'contents' => [
-                {},
-                {},
-                {}
-              ]
+              'type' => 'line_arg'
             },
-            'node_content' => {
-              'contents' => [
-                {}
-              ]
-            },
-            'normalized' => 'direction'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => '('
-            },
-            {
-              'text' => 'man_ual'
-            },
-            {
-              'text' => ')'
-            },
-            {
-              'text' => 'direct'
-            },
-            {
-              'cmdname' => 'comma',
               'contents' => [
                 {
-                  'type' => 'brace_container'
+                  'text' => '('
+                },
+                {
+                  'text' => 'man'
+                },
+                {
+                  'cmdname' => 'comma',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'file_name' => 'nodequote.texi',
+                    'line_nr' => 50
+                  }
+                },
+                {
+                  'text' => 'u:a.l'
+                },
+                {
+                  'text' => ')'
+                },
+                {
+                  'text' => 'direction'
                 }
               ],
-              'source_info' => {
-                'file_name' => 'nodequote.texi',
-                'line_nr' => 50
-              }
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {},
+                    {},
+                    {}
+                  ]
+                },
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'direction'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => 'ion'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
-              'contents' => [
-                {}
-              ]
-            },
-            'node_content' => {
               'contents' => [
-                {},
-                {},
-                {}
-              ]
-            },
-            'normalized' => 'direct_002cion'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
-            },
-            {
-              'text' => 'man_ual'
-            },
-            {
-              'text' => ')'
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'man_ual'
+                },
+                {
+                  'text' => ')'
+                },
+                {
+                  'text' => 'direct'
+                },
+                {
+                  'cmdname' => 'comma',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'file_name' => 'nodequote.texi',
+                    'line_nr' => 50
+                  }
+                },
+                {
+                  'text' => 'ion'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'node_content' => {
+                  'contents' => [
+                    {},
+                    {},
+                    {}
+                  ]
+                },
+                'normalized' => 'direct_002cion'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => 'direct::i.on'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
-              'contents' => [
-                {}
-              ]
-            },
-            'node_content' => {
               'contents' => [
-                {}
-              ]
-            },
-            'normalized' => 'direct_003a_003ai_002eon'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'man_ual'
+                },
+                {
+                  'text' => ')'
+                },
+                {
+                  'text' => 'direct::i.on'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'direct_003a_003ai_002eon'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'normal-node'
@@ -1737,24 +1766,27 @@ $result_trees{'quote_node_names_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'normal node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'normal node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1775,37 +1807,42 @@ $result_trees{'quote_node_names_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'asis',
               'contents' => [
                 {
+                  'cmdname' => 'asis',
                   'contents' => [
                     {
-                      'text' => 'secret,node'
+                      'contents' => [
+                        {
+                          'text' => 'secret,node'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'file_name' => 'nodequote.texi',
+                    'line_nr' => 53
+                  }
                 }
               ],
-              'source_info' => {
-                'file_name' => 'nodequote.texi',
-                'line_nr' => 53
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'secret_002cnode'
@@ -1821,38 +1858,41 @@ $result_trees{'quote_node_names_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'asis',
               'contents' => [
                 {
+                  'cmdname' => 'asis',
                   'contents' => [
                     {
-                      'text' => 'secret,node'
+                      'contents' => [
+                        {
+                          'text' => 'secret,node'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'file_name' => 'nodequote.texi',
+                    'line_nr' => 54
+                  }
                 }
               ],
-              'source_info' => {
-                'file_name' => 'nodequote.texi',
-                'line_nr' => 54
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1873,24 +1913,27 @@ $result_trees{'quote_node_names_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top secret node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top secret node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1923,42 +1966,42 @@ $result_trees{'quote_node_names_info'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'contents'}[3]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'contents'}[3]{'contents'}[1];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'contents'}[3]{'contents'}[2];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[4]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[4]{'contents'}[3]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[5]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[5]{'contents'}[3]{'contents'}[0];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[5]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[5]{'contents'}[3]{'contents'}[1];
-$result_trees{'quote_node_names_info'}{'contents'}[7]{'args'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[7]{'args'}[1]{'contents'}[1];
-$result_trees{'quote_node_names_info'}{'contents'}[7]{'args'}[1]{'extra'}{'manual_content'}{'contents'}[1]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[7]{'args'}[1]{'contents'}[2];
-$result_trees{'quote_node_names_info'}{'contents'}[7]{'args'}[1]{'extra'}{'manual_content'}{'contents'}[2]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[7]{'args'}[1]{'contents'}[3];
-$result_trees{'quote_node_names_info'}{'contents'}[7]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[7]{'args'}[1]{'contents'}[5];
-$result_trees{'quote_node_names_info'}{'contents'}[7]{'args'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[7]{'args'}[2]{'contents'}[1];
-$result_trees{'quote_node_names_info'}{'contents'}[7]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[7]{'args'}[2]{'contents'}[3];
-$result_trees{'quote_node_names_info'}{'contents'}[7]{'args'}[2]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[7]{'args'}[2]{'contents'}[4];
-$result_trees{'quote_node_names_info'}{'contents'}[7]{'args'}[2]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[7]{'args'}[2]{'contents'}[5];
-$result_trees{'quote_node_names_info'}{'contents'}[7]{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[7]{'args'}[3]{'contents'}[1];
-$result_trees{'quote_node_names_info'}{'contents'}[7]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[7]{'args'}[3]{'contents'}[3];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[28]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[28]{'contents'}[2]{'contents'}[3]{'contents'}[0];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[28]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[28]{'contents'}[2]{'contents'}[3]{'contents'}[1];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[28]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[28]{'contents'}[2]{'contents'}[3]{'contents'}[2];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[28]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[28]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[28]{'contents'}[4]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[28]{'contents'}[4]{'contents'}[3]{'contents'}[0];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[28]{'contents'}[5]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[28]{'contents'}[5]{'contents'}[3]{'contents'}[0];
+$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[28]{'contents'}[5]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[28]{'contents'}[5]{'contents'}[3]{'contents'}[1];
+$result_trees{'quote_node_names_info'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'quote_node_names_info'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[1]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'quote_node_names_info'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[2]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[3];
+$result_trees{'quote_node_names_info'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[5];
+$result_trees{'quote_node_names_info'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'quote_node_names_info'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'contents'}[3];
+$result_trees{'quote_node_names_info'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'contents'}[4];
+$result_trees{'quote_node_names_info'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'contents'}[5];
+$result_trees{'quote_node_names_info'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'quote_node_names_info'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names_info'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'contents'}[3];
 
 $result_texis{'quote_node_names_info'} = '@node Top
 @top
diff --git a/tp/t/results/info_tests/recursive_down_menu.pl 
b/tp/t/results/info_tests/recursive_down_menu.pl
index 278976e547..085c36741e 100644
--- a/tp/t/results/info_tests/recursive_down_menu.pl
+++ b/tp/t/results/info_tests/recursive_down_menu.pl
@@ -11,23 +11,28 @@ $result_trees{'recursive_down_menu'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'recursive_down_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -77,23 +85,28 @@ $result_trees{'recursive_down_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapN'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapN'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapN'
@@ -108,24 +121,27 @@ $result_trees{'recursive_down_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Intro'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Intro'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -245,7 +261,7 @@ $result_trees{'recursive_down_menu'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'recursive_down_menu'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'recursive_down_menu'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'recursive_down_menu'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'recursive_down_menu'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'recursive_down_menu'} = '@node Top
 @top top
diff --git a/tp/t/results/info_tests/ref_tests.pl 
b/tp/t/results/info_tests/ref_tests.pl
index 65a2007e17..536c194508 100644
--- a/tp/t/results/info_tests/ref_tests.pl
+++ b/tp/t/results/info_tests/ref_tests.pl
@@ -18,24 +18,27 @@ $result_trees{'ref_tests'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -448,20 +451,20 @@ $result_trees{'ref_tests'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1];
-$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[3];
-$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[1];
-$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[3];
-$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1];
-$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[3];
+$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1];
+$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[3];
+$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[1];
+$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[3];
+$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[5]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[5]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[5]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[5]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[5]{'contents'}[6]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[5]{'contents'}[6]{'contents'}[0]{'contents'}[1];
+$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[5]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_tests'}{'contents'}[1]{'contents'}[5]{'contents'}[6]{'contents'}[0]{'contents'}[3];
 
 $result_texis{'ref_tests'} = '
 @node Top
diff --git a/tp/t/results/info_tests/similar_external_and_internal_node.pl 
b/tp/t/results/info_tests/similar_external_and_internal_node.pl
index a8484cecf6..aa1e8a3369 100644
--- a/tp/t/results/info_tests/similar_external_and_internal_node.pl
+++ b/tp/t/results/info_tests/similar_external_and_internal_node.pl
@@ -11,57 +11,60 @@ $result_trees{'similar_external_and_internal_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'aa'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '('
-            },
-            {
-              'text' => 'toto'
-            },
-            {
-              'text' => ')'
-            },
-            {
-              'text' => 'bb'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'aa'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'node_content' => {
+            {
               'contents' => [
-                {}
-              ]
-            },
-            'normalized' => 'bb'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'toto'
+                },
+                {
+                  'text' => ')'
+                },
+                {
+                  'text' => 'bb'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'bb'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -282,12 +285,12 @@ $result_trees{'similar_external_and_internal_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'args'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'args'}[1]{'contents'}[1];
-$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'args'}[1]{'contents'}[3];
-$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0];
-$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[3];
+$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0];
+$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'similar_external_and_internal_node'}{'contents'}[1]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'similar_external_and_internal_node'} = '@node aa, (toto)bb
 
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 b0a37938f3..841f561434 100644
--- a/tp/t/results/info_tests/space_at_menu_end.pl
+++ b/tp/t/results/info_tests/space_at_menu_end.pl
@@ -11,24 +11,27 @@ $result_trees{'space_at_menu_end'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -183,7 +186,7 @@ $result_trees{'space_at_menu_end'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'space_at_menu_end'} = '@node Top
 
diff --git a/tp/t/results/info_tests/space_in_menu.pl 
b/tp/t/results/info_tests/space_in_menu.pl
index 7397159663..5768aa6c3f 100644
--- a/tp/t/results/info_tests/space_in_menu.pl
+++ b/tp/t/results/info_tests/space_in_menu.pl
@@ -11,23 +11,28 @@ $result_trees{'space_in_menu'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'space_in_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Element'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Element'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -194,23 +202,28 @@ $result_trees{'space_in_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node'
@@ -225,24 +238,27 @@ $result_trees{'space_in_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -273,7 +289,7 @@ $result_trees{'space_in_menu'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'space_in_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'space_in_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'space_in_menu'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'space_in_menu'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'space_in_menu'} = '@node Top
 @top Element
diff --git a/tp/t/results/info_tests/space_in_setfilename.pl 
b/tp/t/results/info_tests/space_in_setfilename.pl
index ebbea36027..094426f150 100644
--- a/tp/t/results/info_tests/space_in_setfilename.pl
+++ b/tp/t/results/info_tests/space_in_setfilename.pl
@@ -68,23 +68,28 @@ $result_trees{'space_in_setfilename'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
diff --git a/tp/t/results/info_tests/split_no_copying.pl 
b/tp/t/results/info_tests/split_no_copying.pl
index 26cf406a9b..3fb61af652 100644
--- a/tp/t/results/info_tests/split_no_copying.pl
+++ b/tp/t/results/info_tests/split_no_copying.pl
@@ -57,23 +57,28 @@ $result_trees{'split_no_copying'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -88,24 +93,27 @@ $result_trees{'split_no_copying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -240,23 +248,28 @@ $result_trees{'split_no_copying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Ch1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Ch1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Ch1'
@@ -271,24 +284,27 @@ $result_trees{'split_no_copying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Ch1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Ch1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -344,7 +360,7 @@ $result_trees{'split_no_copying'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'split_no_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'split_no_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'split_no_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'split_no_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'split_no_copying'} = '\\input texinfo
 @setfilename split_no_copying.info
diff --git a/tp/t/results/info_tests/split_nocopying.pl 
b/tp/t/results/info_tests/split_nocopying.pl
index dd483b1d98..d4436f1dc6 100644
--- a/tp/t/results/info_tests/split_nocopying.pl
+++ b/tp/t/results/info_tests/split_nocopying.pl
@@ -31,23 +31,28 @@ $result_trees{'split_nocopying'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,30 +68,33 @@ $result_trees{'split_nocopying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Test file used to test split Info without '
-            },
-            {
-              'cmdname' => '@'
-            },
-            {
-              'text' => 'copying'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Test file used to test split Info without '
+                },
+                {
+                  'cmdname' => '@'
+                },
+                {
+                  'text' => 'copying'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -225,23 +233,28 @@ $result_trees{'split_nocopying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Ch1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Ch1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Ch1'
@@ -257,24 +270,27 @@ $result_trees{'split_nocopying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Ch1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Ch1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -321,7 +337,7 @@ $result_trees{'split_nocopying'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'split_nocopying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'split_nocopying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'split_nocopying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'split_nocopying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'split_nocopying'} = '\\input texinfo
 
diff --git a/tp/t/results/info_tests/split_nocopying_split.pl 
b/tp/t/results/info_tests/split_nocopying_split.pl
index 299dde6445..44ee8900bc 100644
--- a/tp/t/results/info_tests/split_nocopying_split.pl
+++ b/tp/t/results/info_tests/split_nocopying_split.pl
@@ -31,23 +31,28 @@ $result_trees{'split_nocopying_split'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,30 +68,33 @@ $result_trees{'split_nocopying_split'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Test file used to test split Info without '
-            },
-            {
-              'cmdname' => '@'
-            },
-            {
-              'text' => 'copying'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Test file used to test split Info without '
+                },
+                {
+                  'cmdname' => '@'
+                },
+                {
+                  'text' => 'copying'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -225,23 +233,28 @@ $result_trees{'split_nocopying_split'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Ch1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Ch1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Ch1'
@@ -257,24 +270,27 @@ $result_trees{'split_nocopying_split'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Ch1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Ch1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -321,7 +337,7 @@ $result_trees{'split_nocopying_split'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'split_nocopying_split'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'split_nocopying_split'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'split_nocopying_split'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'split_nocopying_split'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'split_nocopying_split'} = '\\input texinfo
 
diff --git a/tp/t/results/info_tests/split_test_before_first_node.pl 
b/tp/t/results/info_tests/split_test_before_first_node.pl
index 2984404873..3056a536aa 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
@@ -67,23 +67,28 @@ $result_trees{'split_test_before_first_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -98,24 +103,27 @@ $result_trees{'split_test_before_first_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -250,23 +258,28 @@ $result_trees{'split_test_before_first_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap1'
@@ -281,24 +294,27 @@ $result_trees{'split_test_before_first_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -334,7 +350,7 @@ $result_trees{'split_test_before_first_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'split_test_before_first_node'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'split_test_before_first_node'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'split_test_before_first_node'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'split_test_before_first_node'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'split_test_before_first_node'} = '@setfilename 
split_test_before_first_node.info
 
diff --git 
a/tp/t/results/info_tests/split_test_before_first_node_no_empty_line.pl 
b/tp/t/results/info_tests/split_test_before_first_node_no_empty_line.pl
index 79d2f70b64..bcfa5400bf 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
@@ -62,23 +62,28 @@ $result_trees{'split_test_before_first_node_no_empty_line'} 
= {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -93,24 +98,27 @@ $result_trees{'split_test_before_first_node_no_empty_line'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -245,23 +253,28 @@ 
$result_trees{'split_test_before_first_node_no_empty_line'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap1'
@@ -276,24 +289,27 @@ 
$result_trees{'split_test_before_first_node_no_empty_line'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -329,7 +345,7 @@ $result_trees{'split_test_before_first_node_no_empty_line'} 
= {
   ],
   'type' => 'document_root'
 };
-$result_trees{'split_test_before_first_node_no_empty_line'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'split_test_before_first_node_no_empty_line'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'split_test_before_first_node_no_empty_line'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'split_test_before_first_node_no_empty_line'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'split_test_before_first_node_no_empty_line'} = '@setfilename 
split_test_before_first_node_no_empty_line.info
 
diff --git a/tp/t/results/info_tests/test_index.pl 
b/tp/t/results/info_tests/test_index.pl
index 95f65e2478..e4bd6ff06d 100644
--- a/tp/t/results/info_tests/test_index.pl
+++ b/tp/t/results/info_tests/test_index.pl
@@ -11,23 +11,28 @@ $result_trees{'test_index'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'test_index'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Element top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Element top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -950,23 +958,28 @@ $result_trees{'test_index'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'name'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'name'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'name'
@@ -981,24 +994,27 @@ $result_trees{'test_index'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'A chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'A chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2351,23 +2367,28 @@ $result_trees{'test_index'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'name1 
looooooooooooooooooooooooooooooooooooooooooooooooooooooooong'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'name1 
looooooooooooooooooooooooooooooooooooooooooooooooooooooooong'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -2383,24 +2404,27 @@ $result_trees{'test_index'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2603,24 +2627,27 @@ $result_trees{'test_index'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendixsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'appendixsec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'appendixsec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendixsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2640,24 +2667,27 @@ $result_trees{'test_index'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendixsubsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'appendixsubsec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'appendixsubsec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendixsubsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2677,24 +2707,27 @@ $result_trees{'test_index'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendixsubsubsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'appendixsubsubsec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'appendixsubsubsec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendixsubsubsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2747,24 +2780,27 @@ $result_trees{'test_index'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'centerchap',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'centerchap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'centerchap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'centerchap',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2782,24 +2818,27 @@ $result_trees{'test_index'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter end'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter end'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2902,27 +2941,27 @@ $result_trees{'test_index'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'extra'}{'command_as_argument'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'test_index'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[3];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[8]{'extra'}{'command_as_argument'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[10]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[3];
-$result_trees{'test_index'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[3];
-$result_trees{'test_index'}{'contents'}[4]{'contents'}[16]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[3];
-$result_trees{'test_index'}{'contents'}[4]{'contents'}[168]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[3];
-$result_trees{'test_index'}{'contents'}[6]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[5];
-$result_trees{'test_index'}{'contents'}[6]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[5];
-$result_trees{'test_index'}{'contents'}[11]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[5];
+$result_trees{'test_index'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[3];
+$result_trees{'test_index'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[3];
+$result_trees{'test_index'}{'contents'}[4]{'contents'}[17]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[3];
+$result_trees{'test_index'}{'contents'}[4]{'contents'}[169]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[3];
+$result_trees{'test_index'}{'contents'}[6]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[5];
+$result_trees{'test_index'}{'contents'}[6]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[5];
+$result_trees{'test_index'}{'contents'}[11]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'test_index'}{'contents'}[5];
 
 $result_texis{'test_index'} = '@node Top
 @top Element top
diff --git a/tp/t/results/info_tests/text_before_node.pl 
b/tp/t/results/info_tests/text_before_node.pl
index e7b44bd4de..da09a239a0 100644
--- a/tp/t/results/info_tests/text_before_node.pl
+++ b/tp/t/results/info_tests/text_before_node.pl
@@ -11,23 +11,28 @@ $result_trees{'text_before_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'text_before_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -189,23 +197,28 @@ $result_trees{'text_before_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-node'
@@ -220,17 +233,22 @@ $result_trees{'text_before_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'type' => 'line_arg'
             }
           ],
-          'type' => 'line_arg'
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
@@ -246,7 +264,7 @@ $result_trees{'text_before_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'text_before_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'text_before_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'text_before_node'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'text_before_node'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'text_before_node'} = '@node Top
 @top top
diff --git a/tp/t/results/info_tests/top_node_normalization.pl 
b/tp/t/results/info_tests/top_node_normalization.pl
index 794be73a46..103e0bce7d 100644
--- a/tp/t/results/info_tests/top_node_normalization.pl
+++ b/tp/t/results/info_tests/top_node_normalization.pl
@@ -11,24 +11,27 @@ $result_trees{'top_node_normalization'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'ToP'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'ToP'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -214,9 +217,9 @@ $result_trees{'top_node_normalization'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'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 d641d04e8f..d2337b973a 100644
--- a/tp/t/results/info_tests/two_paragraphindent_in_preamble.pl
+++ b/tp/t/results/info_tests/two_paragraphindent_in_preamble.pl
@@ -186,23 +186,28 @@ $result_trees{'two_paragraphindent_in_preamble'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -217,30 +222,33 @@ $result_trees{'two_paragraphindent_in_preamble'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'test '
-            },
-            {
-              'cmdname' => '@'
-            },
-            {
-              'text' => 'paragraphindent in preamble effect in preamble'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'test '
+                },
+                {
+                  'cmdname' => '@'
+                },
+                {
+                  'text' => 'paragraphindent in preamble effect in preamble'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 b4ff1a32b5..3292d2b353 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
@@ -186,23 +186,28 @@ 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -217,30 +222,33 @@ 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'test '
-            },
-            {
-              'cmdname' => '@'
-            },
-            {
-              'text' => 'paragraphindent in preamble effect in preamble'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'test '
+                },
+                {
+                  'cmdname' => '@'
+                },
+                {
+                  'text' => 'paragraphindent in preamble effect in preamble'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/info_tests/unknown_encoding.pl 
b/tp/t/results/info_tests/unknown_encoding.pl
index 7e62b3228c..42f5e5616b 100644
--- a/tp/t/results/info_tests/unknown_encoding.pl
+++ b/tp/t/results/info_tests/unknown_encoding.pl
@@ -53,24 +53,27 @@ $result_trees{'unknown_encoding'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/info_tests/xref_test.pl 
b/tp/t/results/info_tests/xref_test.pl
index c26d68983a..e9816e8d79 100644
--- a/tp/t/results/info_tests/xref_test.pl
+++ b/tp/t/results/info_tests/xref_test.pl
@@ -18,24 +18,27 @@ $result_trees{'xref_test'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -293,16 +296,16 @@ $result_trees{'xref_test'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1];
-$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[3];
-$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[1];
-$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[3];
-$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[8]{'contents'}[0]{'contents'}[1];
-$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[1]{'contents'}[8]{'contents'}[0]{'contents'}[3];
+$result_trees{'xref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'xref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'xref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1];
+$result_trees{'xref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[3];
+$result_trees{'xref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'xref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'xref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[1];
+$result_trees{'xref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[3];
+$result_trees{'xref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[8]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[8]{'contents'}[0]{'contents'}[1];
+$result_trees{'xref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[8]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'xref_test'}{'contents'}[1]{'contents'}[2]{'contents'}[8]{'contents'}[0]{'contents'}[3];
 
 $result_texis{'xref_test'} = '
 @node Top
diff --git a/tp/t/results/init_files_tests/access_document_name_in_handler.pl 
b/tp/t/results/init_files_tests/access_document_name_in_handler.pl
index 9e04e49073..8b4d307f81 100644
--- a/tp/t/results/init_files_tests/access_document_name_in_handler.pl
+++ b/tp/t/results/init_files_tests/access_document_name_in_handler.pl
@@ -16,23 +16,28 @@ $result_trees{'access_document_name_in_handler'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'access_document_name_in_handler'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'access_document_name_in_handler'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -113,23 +126,28 @@ $result_trees{'access_document_name_in_handler'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
diff --git 
a/tp/t/results/init_files_tests/button_replacement_and_direction_customization.pl
 
b/tp/t/results/init_files_tests/button_replacement_and_direction_customization.pl
index 4651b7b174..d806e76eae 100644
--- 
a/tp/t/results/init_files_tests/button_replacement_and_direction_customization.pl
+++ 
b/tp/t/results/init_files_tests/button_replacement_and_direction_customization.pl
@@ -37,23 +37,28 @@ 
$result_trees{'button_replacement_and_direction_customization'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -68,24 +73,27 @@ 
$result_trees{'button_replacement_and_direction_customization'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -103,23 +111,28 @@ 
$result_trees{'button_replacement_and_direction_customization'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -134,23 +147,28 @@ 
$result_trees{'button_replacement_and_direction_customization'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
diff --git 
a/tp/t/results/init_files_tests/button_replacement_direction_strings_customization.pl
 
b/tp/t/results/init_files_tests/button_replacement_direction_strings_customization.pl
index 5e0498d13f..e2daf74f8f 100644
--- 
a/tp/t/results/init_files_tests/button_replacement_direction_strings_customization.pl
+++ 
b/tp/t/results/init_files_tests/button_replacement_direction_strings_customization.pl
@@ -37,23 +37,28 @@ 
$result_trees{'button_replacement_direction_strings_customization'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -68,24 +73,27 @@ 
$result_trees{'button_replacement_direction_strings_customization'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -103,23 +111,28 @@ 
$result_trees{'button_replacement_direction_strings_customization'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -134,23 +147,28 @@ 
$result_trees{'button_replacement_direction_strings_customization'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
diff --git 
a/tp/t/results/init_files_tests/button_replacement_for_special_unit_direction.pl
 
b/tp/t/results/init_files_tests/button_replacement_for_special_unit_direction.pl
index babfd8a364..fab687055f 100644
--- 
a/tp/t/results/init_files_tests/button_replacement_for_special_unit_direction.pl
+++ 
b/tp/t/results/init_files_tests/button_replacement_for_special_unit_direction.pl
@@ -37,23 +37,28 @@ 
$result_trees{'button_replacement_for_special_unit_direction'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -68,24 +73,27 @@ 
$result_trees{'button_replacement_for_special_unit_direction'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -103,23 +111,28 @@ 
$result_trees{'button_replacement_for_special_unit_direction'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -134,23 +147,28 @@ 
$result_trees{'button_replacement_for_special_unit_direction'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
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 c44cc9bfb2..dc4a228112 100644
--- a/tp/t/results/init_files_tests/customize_special_element.pl
+++ b/tp/t/results/init_files_tests/customize_special_element.pl
@@ -61,23 +61,28 @@ $result_trees{'customize_special_element'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -92,24 +97,27 @@ $result_trees{'customize_special_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -127,23 +135,28 @@ $result_trees{'customize_special_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Chapter'
@@ -158,24 +171,27 @@ $result_trees{'customize_special_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -225,23 +241,28 @@ $result_trees{'customize_special_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter fr'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter fr'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Chapter-fr'
@@ -256,24 +277,27 @@ $result_trees{'customize_special_element'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap fr'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap fr'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/init_files_tests/customize_translations.pl 
b/tp/t/results/init_files_tests/customize_translations.pl
index 42b3f1b7ed..fa79034fa9 100644
--- a/tp/t/results/init_files_tests/customize_translations.pl
+++ b/tp/t/results/init_files_tests/customize_translations.pl
@@ -47,23 +47,28 @@ $result_trees{'customize_translations'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -78,24 +83,27 @@ $result_trees{'customize_translations'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -113,23 +121,28 @@ $result_trees{'customize_translations'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Chapter'
@@ -144,24 +157,27 @@ $result_trees{'customize_translations'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -236,23 +252,28 @@ $result_trees{'customize_translations'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter fr'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter fr'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Chapter-fr'
@@ -267,24 +288,27 @@ $result_trees{'customize_translations'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap fr'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap fr'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -329,23 +353,28 @@ $result_trees{'customize_translations'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section fr'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section fr'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section-fr'
@@ -360,24 +389,27 @@ $result_trees{'customize_translations'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec fr'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec fr'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -427,23 +459,28 @@ $result_trees{'customize_translations'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter de'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter de'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Chapter-de'
@@ -458,24 +495,27 @@ $result_trees{'customize_translations'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap de'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap de'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -520,23 +560,28 @@ $result_trees{'customize_translations'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Last chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Last chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Last-chapter'
@@ -551,24 +596,27 @@ $result_trees{'customize_translations'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Last Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Last Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/init_files_tests/directions_string_base.pl 
b/tp/t/results/init_files_tests/directions_string_base.pl
index f6c7191c15..660e06a92b 100644
--- a/tp/t/results/init_files_tests/directions_string_base.pl
+++ b/tp/t/results/init_files_tests/directions_string_base.pl
@@ -16,23 +16,28 @@ $result_trees{'directions_string_base'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'directions_string_base'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'directions_string_base'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -113,24 +126,27 @@ $result_trees{'directions_string_base'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -150,23 +166,28 @@ $result_trees{'directions_string_base'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap2'
@@ -181,24 +202,27 @@ $result_trees{'directions_string_base'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -218,23 +242,28 @@ $result_trees{'directions_string_base'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sec1'
@@ -249,24 +278,27 @@ $result_trees{'directions_string_base'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sec 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sec 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -286,23 +318,28 @@ $result_trees{'directions_string_base'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sec2'
@@ -317,24 +354,27 @@ $result_trees{'directions_string_base'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sec 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sec 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -354,23 +394,28 @@ $result_trees{'directions_string_base'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sec3'
@@ -385,23 +430,28 @@ $result_trees{'directions_string_base'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sec 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sec 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {
         'section_number' => '2.3'
       },
diff --git a/tp/t/results/init_files_tests/directions_string_undef.pl 
b/tp/t/results/init_files_tests/directions_string_undef.pl
index 49067d14dc..d7aac83c45 100644
--- a/tp/t/results/init_files_tests/directions_string_undef.pl
+++ b/tp/t/results/init_files_tests/directions_string_undef.pl
@@ -16,23 +16,28 @@ $result_trees{'directions_string_undef'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'directions_string_undef'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'directions_string_undef'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -113,24 +126,27 @@ $result_trees{'directions_string_undef'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -150,23 +166,28 @@ $result_trees{'directions_string_undef'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap2'
@@ -181,24 +202,27 @@ $result_trees{'directions_string_undef'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -218,23 +242,28 @@ $result_trees{'directions_string_undef'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sec1'
@@ -249,24 +278,27 @@ $result_trees{'directions_string_undef'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sec 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sec 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -286,23 +318,28 @@ $result_trees{'directions_string_undef'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sec2'
@@ -317,24 +354,27 @@ $result_trees{'directions_string_undef'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sec 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sec 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -354,23 +394,28 @@ $result_trees{'directions_string_undef'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sec3'
@@ -385,23 +430,28 @@ $result_trees{'directions_string_undef'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sec 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sec 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {
         'section_number' => '2.3'
       },
diff --git a/tp/t/results/init_files_tests/directions_string_undef_texi2html.pl 
b/tp/t/results/init_files_tests/directions_string_undef_texi2html.pl
index df06b15a1d..13dc97c546 100644
--- a/tp/t/results/init_files_tests/directions_string_undef_texi2html.pl
+++ b/tp/t/results/init_files_tests/directions_string_undef_texi2html.pl
@@ -16,23 +16,28 @@ $result_trees{'directions_string_undef_texi2html'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'directions_string_undef_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'directions_string_undef_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -113,24 +126,27 @@ $result_trees{'directions_string_undef_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -150,23 +166,28 @@ $result_trees{'directions_string_undef_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap2'
@@ -181,24 +202,27 @@ $result_trees{'directions_string_undef_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -218,23 +242,28 @@ $result_trees{'directions_string_undef_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sec1'
@@ -249,24 +278,27 @@ $result_trees{'directions_string_undef_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sec 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sec 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -286,23 +318,28 @@ $result_trees{'directions_string_undef_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sec2'
@@ -317,24 +354,27 @@ $result_trees{'directions_string_undef_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sec 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sec 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -354,23 +394,28 @@ $result_trees{'directions_string_undef_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sec3'
@@ -385,23 +430,28 @@ $result_trees{'directions_string_undef_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sec 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sec 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {
         'section_number' => '2.3'
       },
diff --git a/tp/t/results/init_files_tests/documentation_examples.pl 
b/tp/t/results/init_files_tests/documentation_examples.pl
index 3c7c7c02fd..03c135b45e 100644
--- a/tp/t/results/init_files_tests/documentation_examples.pl
+++ b/tp/t/results/init_files_tests/documentation_examples.pl
@@ -158,23 +158,28 @@ $result_trees{'documentation_examples'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -189,24 +194,27 @@ $result_trees{'documentation_examples'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -224,23 +232,28 @@ $result_trees{'documentation_examples'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -255,24 +268,27 @@ $result_trees{'documentation_examples'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1220,23 +1236,28 @@ $result_trees{'documentation_examples'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'my node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'my node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'my-node'
@@ -1251,24 +1272,27 @@ $result_trees{'documentation_examples'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'New node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'New node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1373,23 +1397,28 @@ $result_trees{'documentation_examples'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -1405,24 +1434,27 @@ $result_trees{'documentation_examples'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1481,9 +1513,9 @@ $result_trees{'documentation_examples'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'documentation_examples'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'documentation_examples'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'contents'}[0]{'contents'}[0];
-$result_trees{'documentation_examples'}{'contents'}[4]{'contents'}[14]{'extra'}{'element_node'}
 = $result_trees{'documentation_examples'}{'contents'}[3];
+$result_trees{'documentation_examples'}{'contents'}[4]{'contents'}[2]{'contents'}[8]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'documentation_examples'}{'contents'}[4]{'contents'}[2]{'contents'}[8]{'contents'}[0]{'contents'}[0];
 
$result_trees{'documentation_examples'}{'contents'}[4]{'contents'}[15]{'extra'}{'element_node'}
 = $result_trees{'documentation_examples'}{'contents'}[3];
+$result_trees{'documentation_examples'}{'contents'}[4]{'contents'}[16]{'extra'}{'element_node'}
 = $result_trees{'documentation_examples'}{'contents'}[3];
 
 $result_texis{'documentation_examples'} = '
 @settitle @email{someone@@example.com, me} @sansserif{in--title} @error{} 
@equiv{}
diff --git a/tp/t/results/init_files_tests/documentation_examples_texi2html.pl 
b/tp/t/results/init_files_tests/documentation_examples_texi2html.pl
index 745cd6b69d..a94e5a9290 100644
--- a/tp/t/results/init_files_tests/documentation_examples_texi2html.pl
+++ b/tp/t/results/init_files_tests/documentation_examples_texi2html.pl
@@ -158,23 +158,28 @@ $result_trees{'documentation_examples_texi2html'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -189,24 +194,27 @@ $result_trees{'documentation_examples_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -224,23 +232,28 @@ $result_trees{'documentation_examples_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -255,24 +268,27 @@ $result_trees{'documentation_examples_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1220,23 +1236,28 @@ $result_trees{'documentation_examples_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'my node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'my node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'my-node'
@@ -1251,24 +1272,27 @@ $result_trees{'documentation_examples_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'New node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'New node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1373,23 +1397,28 @@ $result_trees{'documentation_examples_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -1405,24 +1434,27 @@ $result_trees{'documentation_examples_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1481,9 +1513,9 @@ $result_trees{'documentation_examples_texi2html'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'documentation_examples_texi2html'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'documentation_examples_texi2html'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'contents'}[0]{'contents'}[0];
-$result_trees{'documentation_examples_texi2html'}{'contents'}[4]{'contents'}[14]{'extra'}{'element_node'}
 = $result_trees{'documentation_examples_texi2html'}{'contents'}[3];
+$result_trees{'documentation_examples_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[8]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'documentation_examples_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[8]{'contents'}[0]{'contents'}[0];
 
$result_trees{'documentation_examples_texi2html'}{'contents'}[4]{'contents'}[15]{'extra'}{'element_node'}
 = $result_trees{'documentation_examples_texi2html'}{'contents'}[3];
+$result_trees{'documentation_examples_texi2html'}{'contents'}[4]{'contents'}[16]{'extra'}{'element_node'}
 = $result_trees{'documentation_examples_texi2html'}{'contents'}[3];
 
 $result_texis{'documentation_examples_texi2html'} = '
 @settitle @email{someone@@example.com, me} @sansserif{in--title} @error{} 
@equiv{}
diff --git a/tp/t/results/init_files_tests/redefined_buttons_functions.pl 
b/tp/t/results/init_files_tests/redefined_buttons_functions.pl
index 4524098ad2..4ccd8853ab 100644
--- a/tp/t/results/init_files_tests/redefined_buttons_functions.pl
+++ b/tp/t/results/init_files_tests/redefined_buttons_functions.pl
@@ -16,23 +16,28 @@ $result_trees{'redefined_buttons_functions'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'redefined_buttons_functions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'redefined_buttons_functions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -113,24 +126,27 @@ $result_trees{'redefined_buttons_functions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -150,23 +166,28 @@ $result_trees{'redefined_buttons_functions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap2'
@@ -181,24 +202,27 @@ $result_trees{'redefined_buttons_functions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -218,23 +242,28 @@ $result_trees{'redefined_buttons_functions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sec1'
@@ -249,24 +278,27 @@ $result_trees{'redefined_buttons_functions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sec 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sec 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -286,23 +318,28 @@ $result_trees{'redefined_buttons_functions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sec2'
@@ -317,24 +354,27 @@ $result_trees{'redefined_buttons_functions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sec 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sec 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -354,23 +394,28 @@ $result_trees{'redefined_buttons_functions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sec3'
@@ -385,23 +430,28 @@ $result_trees{'redefined_buttons_functions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sec 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sec 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {
         'section_number' => '2.3'
       },
diff --git a/tp/t/results/init_files_tests/ref_for_special_unit_direction.pl 
b/tp/t/results/init_files_tests/ref_for_special_unit_direction.pl
index 4df6d73b66..3edb34a0ea 100644
--- a/tp/t/results/init_files_tests/ref_for_special_unit_direction.pl
+++ b/tp/t/results/init_files_tests/ref_for_special_unit_direction.pl
@@ -37,23 +37,28 @@ $result_trees{'ref_for_special_unit_direction'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -68,24 +73,27 @@ $result_trees{'ref_for_special_unit_direction'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -103,23 +111,28 @@ $result_trees{'ref_for_special_unit_direction'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -134,23 +147,28 @@ $result_trees{'ref_for_special_unit_direction'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
diff --git 
a/tp/t/results/init_files_tests/special_unit_direction_customization.pl 
b/tp/t/results/init_files_tests/special_unit_direction_customization.pl
index e09c729ad6..48c8e2e430 100644
--- a/tp/t/results/init_files_tests/special_unit_direction_customization.pl
+++ b/tp/t/results/init_files_tests/special_unit_direction_customization.pl
@@ -37,23 +37,28 @@ $result_trees{'special_unit_direction_customization'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -68,24 +73,27 @@ $result_trees{'special_unit_direction_customization'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -103,23 +111,28 @@ $result_trees{'special_unit_direction_customization'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -134,23 +147,28 @@ $result_trees{'special_unit_direction_customization'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
diff --git 
a/tp/t/results/init_files_tests/test_format_single_footnote_in_inline_content.pl
 
b/tp/t/results/init_files_tests/test_format_single_footnote_in_inline_content.pl
index 3ef24a61e2..a78af49d99 100644
--- 
a/tp/t/results/init_files_tests/test_format_single_footnote_in_inline_content.pl
+++ 
b/tp/t/results/init_files_tests/test_format_single_footnote_in_inline_content.pl
@@ -16,23 +16,28 @@ 
$result_trees{'test_format_single_footnote_in_inline_content'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ 
$result_trees{'test_format_single_footnote_in_inline_content'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ 
$result_trees{'test_format_single_footnote_in_inline_content'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -113,24 +126,27 @@ 
$result_trees{'test_format_single_footnote_in_inline_content'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -480,8 +496,8 @@ 
$result_trees{'test_format_single_footnote_in_inline_content'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'test_format_single_footnote_in_inline_content'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'quotation'}
 = 
$result_trees{'test_format_single_footnote_in_inline_content'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'test_format_single_footnote_in_inline_content'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'authors'}[0]
 = 
$result_trees{'test_format_single_footnote_in_inline_content'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'test_format_single_footnote_in_inline_content'}{'contents'}[4]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'quotation'}
 = 
$result_trees{'test_format_single_footnote_in_inline_content'}{'contents'}[4]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'test_format_single_footnote_in_inline_content'}{'contents'}[4]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'authors'}[0]
 = 
$result_trees{'test_format_single_footnote_in_inline_content'}{'contents'}[4]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
 $result_texis{'test_format_single_footnote_in_inline_content'} = '@node Top
 @top top
diff --git 
a/tp/t/results/init_files_tests/translation_in_parser_in_translation.pl 
b/tp/t/results/init_files_tests/translation_in_parser_in_translation.pl
index 66cbe0105d..bee84c8148 100644
--- a/tp/t/results/init_files_tests/translation_in_parser_in_translation.pl
+++ b/tp/t/results/init_files_tests/translation_in_parser_in_translation.pl
@@ -53,23 +53,28 @@ $result_trees{'translation_in_parser_in_translation'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -84,24 +89,27 @@ $result_trees{'translation_in_parser_in_translation'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -119,23 +127,28 @@ $result_trees{'translation_in_parser_in_translation'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -150,24 +163,27 @@ $result_trees{'translation_in_parser_in_translation'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -427,7 +443,7 @@ $result_trees{'translation_in_parser_in_translation'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'translation_in_parser_in_translation'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'translation_in_parser_in_translation'}{'contents'}[3];
+$result_trees{'translation_in_parser_in_translation'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'translation_in_parser_in_translation'}{'contents'}[3];
 
 $result_texis{'translation_in_parser_in_translation'} = '@documentlanguage fr
 
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 61a767a286..676e73b6f9 100644
--- a/tp/t/results/init_files_tests/undefined_node_filename.pl
+++ b/tp/t/results/init_files_tests/undefined_node_filename.pl
@@ -16,24 +16,27 @@ $result_trees{'undefined_node_filename'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -54,23 +57,28 @@ $result_trees{'undefined_node_filename'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap Other'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap Other'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap-Other'
diff --git a/tp/t/results/init_files_tests/unknown_custom_variable.pl 
b/tp/t/results/init_files_tests/unknown_custom_variable.pl
index fbfc3302fb..d3617dbe1c 100644
--- a/tp/t/results/init_files_tests/unknown_custom_variable.pl
+++ b/tp/t/results/init_files_tests/unknown_custom_variable.pl
@@ -11,23 +11,28 @@ $result_trees{'unknown_custom_variable'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'unknown_custom_variable'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -77,23 +85,28 @@ $result_trees{'unknown_custom_variable'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Chap'
@@ -108,23 +121,28 @@ $result_trees{'unknown_custom_variable'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
diff --git a/tp/t/results/invalid_nestings/footnote_in_ref.pl 
b/tp/t/results/invalid_nestings/footnote_in_ref.pl
index b9c367441a..c7fcde6089 100644
--- a/tp/t/results/invalid_nestings/footnote_in_ref.pl
+++ b/tp/t/results/invalid_nestings/footnote_in_ref.pl
@@ -11,24 +11,27 @@ $result_trees{'footnote_in_ref'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/invalid_nestings/ignore_in_xref.pl 
b/tp/t/results/invalid_nestings/ignore_in_xref.pl
index 509a6402ca..04ceff66dc 100644
--- a/tp/t/results/invalid_nestings/ignore_in_xref.pl
+++ b/tp/t/results/invalid_nestings/ignore_in_xref.pl
@@ -11,24 +11,27 @@ $result_trees{'ignore_in_xref'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -152,7 +155,7 @@ $result_trees{'ignore_in_xref'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ignore_in_xref'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[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 b473439e0c..6e07930094 100644
--- a/tp/t/results/invalid_nestings/ignored_text.pl
+++ b/tp/t/results/invalid_nestings/ignored_text.pl
@@ -11,52 +11,55 @@ $result_trees{'ignored_text'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'before ignore'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'source_marks' => [
+              'contents' => [
                 {
-                  'counter' => 1,
-                  'element' => {
-                    'cmdname' => 'ifinfo',
-                    'contents' => [
-                      {
+                  'text' => 'before ignore'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'source_marks' => [
+                    {
+                      'counter' => 1,
+                      'element' => {
+                        'cmdname' => 'ifinfo',
                         'contents' => [
                           {
-                            'info' => {
-                              'spaces_after_argument' => {
-                                'text' => '
+                            'contents' => [
+                              {
+                                'info' => {
+                                  'spaces_after_argument' => {
+                                    'text' => '
 '
+                                  }
+                                },
+                                'type' => 'block_line_arg'
                               }
-                            },
-                            'type' => 'block_line_arg'
+                            ],
+                            'type' => 'argument'
                           }
                         ],
-                        'type' => 'argument'
-                      }
-                    ],
-                    'source_info' => {
-                      'line_nr' => 1
+                        'source_info' => {
+                          'line_nr' => 1
+                        }
+                      },
+                      'position' => 1,
+                      'sourcemark_type' => 'ignored_conditional_block'
                     }
-                  },
-                  'position' => 1,
-                  'sourcemark_type' => 'ignored_conditional_block'
+                  ],
+                  'text' => ' '
                 }
-              ],
-              'text' => ' '
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
diff --git a/tp/t/results/invalid_nestings/in_table.pl 
b/tp/t/results/invalid_nestings/in_table.pl
index df1618b540..483c476d6c 100644
--- a/tp/t/results/invalid_nestings/in_table.pl
+++ b/tp/t/results/invalid_nestings/in_table.pl
@@ -18,23 +18,28 @@ $result_trees{'in_table'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -49,24 +54,27 @@ $result_trees{'in_table'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -951,14 +959,14 @@ $result_trees{'in_table'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'in_table'}{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'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]{'extra'}{'command_as_argument'}
 = 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[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'}{'element_node'}
 = $result_trees{'in_table'}{'contents'}[2];
-$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'in_table'}{'contents'}[2];
-$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'in_table'}{'contents'}[2];
-$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'in_table'}{'contents'}[2]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'in_table'}{'contents'}[2];
+$result_trees{'in_table'}{'contents'}[2]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'in_table'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'in_table'}{'contents'}[2];
+$result_trees{'in_table'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'in_table'}{'contents'}[2];
+$result_trees{'in_table'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'in_table'}{'contents'}[2];
+$result_trees{'in_table'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'in_table'}{'contents'}[2];
+$result_trees{'in_table'}{'contents'}[2]{'contents'}[6]{'extra'}{'command_as_argument'}
 = 
$result_trees{'in_table'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'in_table'} = '
 @node Top
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 1b1e833abf..2354039063 100644
--- a/tp/t/results/invalid_nestings/menu_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/menu_in_style_command.pl
@@ -11,24 +11,27 @@ $result_trees{'menu_in_style_command'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -176,7 +179,7 @@ $result_trees{'menu_in_style_command'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'menu_in_style_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu_in_style_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu_in_style_command'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu_in_style_command'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
 $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 7a03a18a11..8485fdee0c 100644
--- a/tp/t/results/invalid_nestings/node_in_copying.pl
+++ b/tp/t/results/invalid_nestings/node_in_copying.pl
@@ -35,24 +35,27 @@ $result_trees{'node_in_copying'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 0716a6f77f..6dcbaadeaf 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
@@ -59,23 +59,28 @@ $result_trees{'node_in_copying_not_closed'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -90,24 +95,27 @@ $result_trees{'node_in_copying_not_closed'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 733cb6e584..bfa5a72218 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
@@ -52,127 +52,130 @@ $result_trees{'node_on_index_entry_line'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'a'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '('
-            },
-            {
-              'text' => 'm'
-            },
-            {
-              'text' => ')'
-            },
-            {
-              'text' => 'b'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
-              'contents' => [
-                {}
-              ]
-            },
-            'node_content' => {
               'contents' => [
-                {}
-              ]
-            },
-            'normalized' => 'b'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
-            },
-            {
-              'text' => 'm'
-            },
-            {
-              'text' => ')'
+                {
+                  'text' => 'a'
+                }
+              ],
+              'type' => 'line_arg'
             },
             {
-              'text' => 'c'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
-              'contents' => [
-                {}
-              ]
-            },
-            'node_content' => {
               'contents' => [
-                {}
-              ]
-            },
-            'normalized' => 'c'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
-            },
-            {
-              'text' => 'h'
-            },
-            {
-              'text' => ')'
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'm'
+                },
+                {
+                  'text' => ')'
+                },
+                {
+                  'text' => 'b'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'b'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => 'd'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'm'
+                },
+                {
+                  'text' => ')'
+                },
+                {
+                  'text' => 'c'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'c'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'node_content' => {
+            {
               'contents' => [
-                {}
-              ]
-            },
-            'normalized' => 'd'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'h'
+                },
+                {
+                  'text' => ')'
+                },
+                {
+                  'text' => 'd'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'd'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -204,12 +207,12 @@ $result_trees{'node_on_index_entry_line'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[1]{'contents'}[1];
-$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[1]{'contents'}[3];
-$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[2]{'contents'}[1];
-$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[2]{'contents'}[3];
-$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'args'}[3]{'contents'}[3];
+$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[3];
+$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[3];
+$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_on_index_entry_line'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[3];
 
 $result_texis{'node_on_index_entry_line'} = '
 @cindex entry @node a, (m)b, (m)c, (h)d
diff --git a/tp/t/results/invalid_nestings/on_node_line.pl 
b/tp/t/results/invalid_nestings/on_node_line.pl
index d980897605..77fa187cb0 100644
--- a/tp/t/results/invalid_nestings/on_node_line.pl
+++ b/tp/t/results/invalid_nestings/on_node_line.pl
@@ -11,220 +11,225 @@ $result_trees{'on_node_line'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'ref',
               'contents' => [
                 {
+                  'cmdname' => 'ref',
                   'contents' => [
                     {
-                      'text' => 'a'
-                    }
-                  ],
-                  'extra' => {
-                    'node_content' => {
                       'contents' => [
-                        {}
-                      ]
-                    }
-                  },
-                  'type' => 'brace_arg'
-                },
-                {
-                  'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'extra' => {
+                        'node_content' => {
+                          'contents' => [
+                            {}
+                          ]
+                        }
+                      },
+                      'type' => 'brace_arg'
+                    },
                     {
-                      'text' => 'b'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
-                },
-                {
-                  'contents' => [
+                      'contents' => [
+                        {
+                          'text' => 'b'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
+                    },
                     {
-                      'text' => 'c'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
-                },
-                {
-                  'contents' => [
+                      'contents' => [
+                        {
+                          'text' => 'c'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
+                    },
                     {
-                      'text' => 'filename'
+                      'contents' => [
+                        {
+                          'text' => 'filename'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 1
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 1
-              }
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
+              'type' => 'line_arg'
             },
             {
-              'cmdname' => 'pxref',
               'contents' => [
                 {
+                  'text' => '('
+                },
+                {
+                  'cmdname' => 'pxref',
                   'contents' => [
                     {
-                      'text' => '('
-                    },
-                    {
-                      'text' => 'somemanual'
-                    },
-                    {
-                      'text' => ')'
-                    },
-                    {
-                      'text' => 'Top'
-                    }
-                  ],
-                  'extra' => {
-                    'manual_content' => {
-                      'contents' => [
-                        {}
-                      ]
-                    },
-                    'node_content' => {
                       'contents' => [
-                        {}
-                      ]
+                        {
+                          'text' => '('
+                        },
+                        {
+                          'text' => 'somemanual'
+                        },
+                        {
+                          'text' => ')'
+                        },
+                        {
+                          'text' => 'Top'
+                        }
+                      ],
+                      'extra' => {
+                        'manual_content' => {
+                          'contents' => [
+                            {}
+                          ]
+                        },
+                        'node_content' => {
+                          'contents' => [
+                            {}
+                          ]
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 1
-              }
-            },
-            {
-              'text' => ')'
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'anchor',
-              'contents' => [
+                  ],
+                  'source_info' => {
+                    'line_nr' => 1
+                  }
+                },
                 {
+                  'text' => ')'
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'anchor',
                   'contents' => [
                     {
-                      'text' => 'in anchor'
+                      'contents' => [
+                        {
+                          'text' => 'in anchor'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
-                }
-              ],
-              'extra' => {
-                'is_target' => 1,
-                'normalized' => 'in-anchor'
-              },
-              'source_info' => {
-                'line_nr' => 1
-              }
-            },
-            {
-              'cmdname' => 'footnote',
-              'contents' => [
+                  'extra' => {
+                    'is_target' => 1,
+                    'normalized' => 'in-anchor'
+                  },
+                  'source_info' => {
+                    'line_nr' => 1
+                  }
+                },
                 {
+                  'cmdname' => 'footnote',
                   'contents' => [
                     {
                       'contents' => [
                         {
-                          'text' => 'footnote'
+                          'contents' => [
+                            {
+                              'text' => 'footnote'
+                            }
+                          ],
+                          'type' => 'paragraph'
                         }
                       ],
-                      'type' => 'paragraph'
+                      'type' => 'brace_command_context'
                     }
                   ],
-                  'type' => 'brace_command_context'
-                }
-              ],
-              'extra' => {},
-              'source_info' => {
-                'line_nr' => 1
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'args' => [
+                  'extra' => {},
+                  'source_info' => {
+                    'line_nr' => 1
+                  }
+                },
                 {
-                  'contents' => [
+                  'text' => ' '
+                },
+                {
+                  'args' => [
                     {
-                      'text' => 'exdent'
+                      'contents' => [
+                        {
+                          'text' => 'exdent'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_after_argument' => {
+                          'text' => '
+'
+                        }
+                      },
+                      'type' => 'line_arg'
                     }
                   ],
+                  'cmdname' => 'exdent',
                   'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
-'
+                    'spaces_before_argument' => {
+                      'text' => ' '
                     }
                   },
-                  'type' => 'line_arg'
+                  'source_info' => {
+                    'line_nr' => 1
+                  }
                 }
               ],
-              'cmdname' => 'exdent',
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'node_content' => {
+                  'contents' => [
+                    {},
+                    {},
+                    {},
+                    {}
+                  ]
+                },
+                'normalized' => '-'
+              },
               'info' => {
                 'spaces_before_argument' => {
                   'text' => ' '
                 }
               },
-              'source_info' => {
-                'line_nr' => 1
-              }
+              'type' => 'line_arg'
             }
           ],
-          'extra' => {
-            'manual_content' => {
-              'contents' => [
-                {}
-              ]
-            },
-            'node_content' => {
-              'contents' => [
-                {},
-                {},
-                {},
-                {}
-              ]
-            },
-            'normalized' => '-'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'a'
@@ -241,14 +246,14 @@ $result_trees{'on_node_line'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'on_node_line'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3];
-$result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = $result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[1];
-$result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[4];
-$result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = $result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[5];
-$result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = $result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[6];
-$result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = $result_trees{'on_node_line'}{'contents'}[1]{'args'}[1]{'contents'}[7];
+$result_trees{'on_node_line'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'on_node_line'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'on_node_line'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'on_node_line'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1];
+$result_trees{'on_node_line'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'on_node_line'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3];
+$result_trees{'on_node_line'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'on_node_line'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'on_node_line'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'on_node_line'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[4];
+$result_trees{'on_node_line'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'on_node_line'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[5];
+$result_trees{'on_node_line'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'on_node_line'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[6];
+$result_trees{'on_node_line'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'on_node_line'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[7];
 
 $result_texis{'on_node_line'} = '@node @ref{a, b, c, filename}, 
(@pxref{(somemanual)Top}) @anchor{in anchor}@footnote{footnote} @exdent exdent
 ';
diff --git a/tp/t/results/invalid_nestings/on_section_line.pl 
b/tp/t/results/invalid_nestings/on_section_line.pl
index 9c9093528d..eba9e83ecb 100644
--- a/tp/t/results/invalid_nestings/on_section_line.pl
+++ b/tp/t/results/invalid_nestings/on_section_line.pl
@@ -11,119 +11,124 @@ $result_trees{'on_section_line'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'noindent',
-              'source_info' => {
-                'line_nr' => 1
-              }
-            },
-            {
-              'text' => ' ',
-              'type' => 'ignorable_spaces_after_command'
-            },
-            {
-              'text' => 'Text '
-            },
-            {
-              'cmdname' => 'titlefont',
               'contents' => [
                 {
+                  'cmdname' => 'noindent',
+                  'source_info' => {
+                    'line_nr' => 1
+                  }
+                },
+                {
+                  'text' => ' ',
+                  'type' => 'ignorable_spaces_after_command'
+                },
+                {
+                  'text' => 'Text '
+                },
+                {
+                  'cmdname' => 'titlefont',
                   'contents' => [
                     {
-                      'text' => 'in titlefont'
+                      'contents' => [
+                        {
+                          'text' => 'in titlefont'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'extra' => {},
-              'source_info' => {
-                'line_nr' => 1
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'anchor',
-              'contents' => [
+                  'extra' => {},
+                  'source_info' => {
+                    'line_nr' => 1
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'anchor',
                   'contents' => [
                     {
-                      'text' => 'in anchor'
+                      'contents' => [
+                        {
+                          'text' => 'in anchor'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
-                }
-              ],
-              'extra' => {
-                'is_target' => 1,
-                'normalized' => 'in-anchor'
-              },
-              'source_info' => {
-                'line_nr' => 1
-              }
-            },
-            {
-              'cmdname' => 'footnote',
-              'contents' => [
+                  'extra' => {
+                    'is_target' => 1,
+                    'normalized' => 'in-anchor'
+                  },
+                  'source_info' => {
+                    'line_nr' => 1
+                  }
+                },
                 {
+                  'cmdname' => 'footnote',
                   'contents' => [
                     {
                       'contents' => [
                         {
-                          'text' => 'footnote'
+                          'contents' => [
+                            {
+                              'text' => 'footnote'
+                            }
+                          ],
+                          'type' => 'paragraph'
                         }
                       ],
-                      'type' => 'paragraph'
+                      'type' => 'brace_command_context'
                     }
                   ],
-                  'type' => 'brace_command_context'
-                }
-              ],
-              'extra' => {},
-              'source_info' => {
-                'line_nr' => 1
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'args' => [
+                  'extra' => {},
+                  'source_info' => {
+                    'line_nr' => 1
+                  }
+                },
                 {
-                  'contents' => [
+                  'text' => ' '
+                },
+                {
+                  'args' => [
                     {
-                      'text' => 'exdent'
+                      'contents' => [
+                        {
+                          'text' => 'exdent'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_after_argument' => {
+                          'text' => '
+'
+                        }
+                      },
+                      'type' => 'line_arg'
                     }
                   ],
+                  'cmdname' => 'exdent',
                   'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
-'
+                    'spaces_before_argument' => {
+                      'text' => ' '
                     }
                   },
-                  'type' => 'line_arg'
+                  'source_info' => {
+                    'line_nr' => 1
+                  }
                 }
               ],
-              'cmdname' => 'exdent',
-              'info' => {
-                'spaces_before_argument' => {
-                  'text' => ' '
-                }
-              },
-              'source_info' => {
-                'line_nr' => 1
-              }
+              'type' => 'line_arg'
             }
           ],
-          'type' => 'line_arg'
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {
         'section_number' => '1'
       },
diff --git a/tp/t/results/invalid_nestings/quotation_in_ref.pl 
b/tp/t/results/invalid_nestings/quotation_in_ref.pl
index c7eb5a0cf6..e38d75e91f 100644
--- a/tp/t/results/invalid_nestings/quotation_in_ref.pl
+++ b/tp/t/results/invalid_nestings/quotation_in_ref.pl
@@ -11,24 +11,27 @@ $result_trees{'quotation_in_ref'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/invalid_nestings/ref_in_ref.pl 
b/tp/t/results/invalid_nestings/ref_in_ref.pl
index f3052037d1..ef9402aa9e 100644
--- a/tp/t/results/invalid_nestings/ref_in_ref.pl
+++ b/tp/t/results/invalid_nestings/ref_in_ref.pl
@@ -11,24 +11,27 @@ $result_trees{'ref_in_ref'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -96,8 +99,8 @@ $result_trees{'ref_in_ref'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ref_in_ref'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_ref'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_ref'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_ref'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'ref_in_ref'} = '@node first
 @ref{@ref{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 1f029b6ccf..4d4d23a0e1 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
@@ -11,24 +11,27 @@ $result_trees{'ref_to_top_in_anchor'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'anchor',
           'contents' => [
@@ -90,7 +93,7 @@ $result_trees{'ref_to_top_in_anchor'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ref_to_top_in_anchor'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_to_top_in_anchor'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_to_top_in_anchor'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_to_top_in_anchor'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'ref_to_top_in_anchor'} = '@node Top
 @anchor{TOP @ref{Top}}';
diff --git a/tp/t/results/invalid_nestings/section_in_copying.pl 
b/tp/t/results/invalid_nestings/section_in_copying.pl
index e0b34251e5..92120220f8 100644
--- a/tp/t/results/invalid_nestings/section_in_copying.pl
+++ b/tp/t/results/invalid_nestings/section_in_copying.pl
@@ -54,23 +54,28 @@ $result_trees{'section_in_copying'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {
         'section_number' => '1'
       },
diff --git a/tp/t/results/invalid_nestings/section_in_flushright.pl 
b/tp/t/results/invalid_nestings/section_in_flushright.pl
index 8158d7ad36..dcce3254fd 100644
--- a/tp/t/results/invalid_nestings/section_in_flushright.pl
+++ b/tp/t/results/invalid_nestings/section_in_flushright.pl
@@ -54,23 +54,28 @@ $result_trees{'section_in_flushright'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'a section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'a section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {
         'section_number' => '1'
       },
diff --git a/tp/t/results/invalid_nestings/section_in_footnote.pl 
b/tp/t/results/invalid_nestings/section_in_footnote.pl
index 8a0ebcd2bb..b26f3c3415 100644
--- a/tp/t/results/invalid_nestings/section_in_footnote.pl
+++ b/tp/t/results/invalid_nestings/section_in_footnote.pl
@@ -50,23 +50,28 @@ $result_trees{'section_in_footnote'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'a section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'a section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {
         'section_number' => '1'
       },
diff --git a/tp/t/results/invalid_nestings/section_in_math.pl 
b/tp/t/results/invalid_nestings/section_in_math.pl
index cd18c9188d..55ef9c701d 100644
--- a/tp/t/results/invalid_nestings/section_in_math.pl
+++ b/tp/t/results/invalid_nestings/section_in_math.pl
@@ -62,24 +62,27 @@ $result_trees{'section_in_math'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -134,23 +137,28 @@ $result_trees{'section_in_math'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {
         'section_number' => '2'
       },
diff --git a/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl 
b/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
index d9eab87894..e3bf7ffa7b 100644
--- a/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
+++ b/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
@@ -148,23 +148,28 @@ $result_trees{'section_in_nested_block_commands'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'a section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'a section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {
         'section_number' => '1'
       },
diff --git a/tp/t/results/invalid_nestings/section_in_table.pl 
b/tp/t/results/invalid_nestings/section_in_table.pl
index 3d6f7fedb9..f2f3c75c97 100644
--- a/tp/t/results/invalid_nestings/section_in_table.pl
+++ b/tp/t/results/invalid_nestings/section_in_table.pl
@@ -98,24 +98,27 @@ $result_trees{'section_in_table'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/invalid_nestings/section_on_cartouche_line.pl 
b/tp/t/results/invalid_nestings/section_on_cartouche_line.pl
index 78a12dbf4e..615416470c 100644
--- a/tp/t/results/invalid_nestings/section_on_cartouche_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_cartouche_line.pl
@@ -29,24 +29,27 @@ $result_trees{'section_on_cartouche_line'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -87,23 +90,28 @@ $result_trees{'section_on_cartouche_line'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second spaces'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'second spaces'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {
         'section_number' => '2'
       },
diff --git a/tp/t/results/invalid_nestings/section_on_def_line.pl 
b/tp/t/results/invalid_nestings/section_on_def_line.pl
index 40595dd5f4..2120c30f4a 100644
--- a/tp/t/results/invalid_nestings/section_on_def_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_def_line.pl
@@ -95,24 +95,27 @@ $result_trees{'section_on_def_line'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 's'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 's'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/invalid_nestings/section_on_defx_line.pl 
b/tp/t/results/invalid_nestings/section_on_defx_line.pl
index 2bc5395dba..ffd18b2765 100644
--- a/tp/t/results/invalid_nestings/section_on_defx_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_defx_line.pl
@@ -204,24 +204,27 @@ $result_trees{'section_on_defx_line'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 's'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 's'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/invalid_nestings/section_on_enumerate_line.pl 
b/tp/t/results/invalid_nestings/section_on_enumerate_line.pl
index b195ca3f56..fe6793541f 100644
--- a/tp/t/results/invalid_nestings/section_on_enumerate_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_enumerate_line.pl
@@ -47,24 +47,27 @@ $result_trees{'section_on_enumerate_line'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -118,23 +121,28 @@ $result_trees{'section_on_enumerate_line'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'second'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {
         'section_number' => '2'
       },
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 09488a8b5c..6a2fadb0f4 100644
--- a/tp/t/results/invalid_nestings/section_on_float_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_float_line.pl
@@ -60,23 +60,28 @@ $result_trees{'section_on_float_line'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {
         'section_number' => '1'
       },
diff --git a/tp/t/results/invalid_nestings/section_on_index_entry_line.pl 
b/tp/t/results/invalid_nestings/section_on_index_entry_line.pl
index 15f2ae41b0..89131c5623 100644
--- a/tp/t/results/invalid_nestings/section_on_index_entry_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_index_entry_line.pl
@@ -47,24 +47,27 @@ $result_trees{'section_on_index_entry_line'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'b'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'b'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/invalid_nestings/section_on_itemize_line.pl 
b/tp/t/results/invalid_nestings/section_on_itemize_line.pl
index 9096ae7b36..3a4bcb09e7 100644
--- a/tp/t/results/invalid_nestings/section_on_itemize_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_itemize_line.pl
@@ -55,24 +55,27 @@ $result_trees{'section_on_itemize_line'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -134,24 +137,27 @@ $result_trees{'section_on_itemize_line'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'second'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -203,24 +209,27 @@ $result_trees{'section_on_itemize_line'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'third'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'third'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -274,23 +283,28 @@ $result_trees{'section_on_itemize_line'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'fourth'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'fourth'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {
         'section_number' => '4'
       },
@@ -307,7 +321,7 @@ $result_trees{'section_on_itemize_line'} = {
   'type' => 'document_root'
 };
 
$result_trees{'section_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'section_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'section_on_itemize_line'}{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'section_on_itemize_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'section_on_itemize_line'}{'contents'}[2]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'section_on_itemize_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'section_on_itemize_line'} = '@itemize @minus{} @section first
 
diff --git a/tp/t/results/invalid_nestings/section_on_multitable_line.pl 
b/tp/t/results/invalid_nestings/section_on_multitable_line.pl
index 16eff491f7..fde3834120 100644
--- a/tp/t/results/invalid_nestings/section_on_multitable_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_multitable_line.pl
@@ -37,24 +37,27 @@ $result_trees{'section_on_multitable_line'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -121,24 +124,27 @@ $result_trees{'section_on_multitable_line'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'second'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -214,23 +220,28 @@ $result_trees{'section_on_multitable_line'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'third'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'third'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {
         'section_number' => '3'
       },
diff --git a/tp/t/results/invalid_nestings/section_on_xtable_line.pl 
b/tp/t/results/invalid_nestings/section_on_xtable_line.pl
index f674acbe46..d39328b2b6 100644
--- a/tp/t/results/invalid_nestings/section_on_xtable_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_xtable_line.pl
@@ -45,24 +45,27 @@ $result_trees{'section_on_xtable_line'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -125,24 +128,27 @@ $result_trees{'section_on_xtable_line'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'second'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -199,24 +205,27 @@ $result_trees{'section_on_xtable_line'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'third'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'third'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -279,23 +288,28 @@ $result_trees{'section_on_xtable_line'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'fourth'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'fourth'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {
         'section_number' => '4'
       },
@@ -312,9 +326,9 @@ $result_trees{'section_on_xtable_line'} = {
   'type' => 'document_root'
 };
 
$result_trees{'section_on_xtable_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'section_on_xtable_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'section_on_xtable_line'}{'contents'}[1]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'section_on_xtable_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'section_on_xtable_line'}{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'section_on_xtable_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'section_on_xtable_line'}{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'section_on_xtable_line'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'section_on_xtable_line'}{'contents'}[1]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'section_on_xtable_line'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'section_on_xtable_line'}{'contents'}[2]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'section_on_xtable_line'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'section_on_xtable_line'}{'contents'}[3]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'section_on_xtable_line'}{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'section_on_xtable_line'} = '@vtable @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 db307fcf69..6090f8f633 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
@@ -40,24 +40,27 @@ $result_trees{'style_not_closed_before_first_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
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 9bb27ea832..4b8694ace0 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
@@ -11,23 +11,28 @@ $result_trees{'style_not_closed_no_newline_root_commands'} 
= {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'style_not_closed_no_newline_root_commands'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -202,23 +210,28 @@ 
$result_trees{'style_not_closed_no_newline_root_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -233,24 +246,27 @@ 
$result_trees{'style_not_closed_no_newline_root_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -304,7 +320,7 @@ $result_trees{'style_not_closed_no_newline_root_commands'} 
= {
   ],
   'type' => 'document_root'
 };
-$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'style_not_closed_no_newline_root_commands'} = '@node Top
 @top top
diff --git a/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl 
b/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl
index 8cbea8265c..a72d533c19 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
@@ -11,23 +11,28 @@ $result_trees{'style_not_closed_root_commands'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'style_not_closed_root_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -207,23 +215,28 @@ $result_trees{'style_not_closed_root_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -238,24 +251,27 @@ $result_trees{'style_not_closed_root_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -314,7 +330,7 @@ $result_trees{'style_not_closed_root_commands'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'style_not_closed_root_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'style_not_closed_root_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'style_not_closed_root_commands'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'style_not_closed_root_commands'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'style_not_closed_root_commands'} = '@node Top
 @top top
diff --git a/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl 
b/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl
index b8258f7704..9c4e2d7af9 100644
--- a/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl
+++ b/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl
@@ -11,48 +11,53 @@ $result_trees{'unclosed_verb_on_section_line'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'in section '
-            },
-            {
-              'cmdname' => 'verb',
               'contents' => [
                 {
+                  'text' => 'in section '
+                },
+                {
+                  'cmdname' => 'verb',
                   'contents' => [
                     {
-                      'text' => 'ruc
+                      'contents' => [
+                        {
+                          'text' => 'ruc
 ',
-                      'type' => 'raw'
-                    },
-                    {
-                      'text' => '
+                          'type' => 'raw'
+                        },
+                        {
+                          'text' => '
 ',
-                      'type' => 'raw'
-                    },
-                    {
-                      'text' => 'Now text.
+                          'type' => 'raw'
+                        },
+                        {
+                          'text' => 'Now text.
 ',
-                      'type' => 'raw'
+                          'type' => 'raw'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'info' => {
+                    'delimiter' => 'T'
+                  },
+                  'source_info' => {
+                    'line_nr' => 1
+                  }
                 }
               ],
-              'info' => {
-                'delimiter' => 'T'
-              },
-              'source_info' => {
-                'line_nr' => 1
-              }
+              'type' => 'line_arg'
             }
           ],
-          'type' => 'line_arg'
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {
         'section_number' => '1'
       },
diff --git a/tp/t/results/invalid_nestings/verbatim_in_ref.pl 
b/tp/t/results/invalid_nestings/verbatim_in_ref.pl
index d787d04d38..9889035144 100644
--- a/tp/t/results/invalid_nestings/verbatim_in_ref.pl
+++ b/tp/t/results/invalid_nestings/verbatim_in_ref.pl
@@ -11,24 +11,27 @@ $result_trees{'verbatim_in_ref'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 d4db499114..12c79be01b 100644
--- a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
@@ -16,23 +16,28 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -113,24 +126,27 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -992,13 +1008,13 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'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'}[11]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[10]{'contents'}[1]{'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'}[12]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[12]{'contents'}[1]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[12]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
 
 $result_texis{'inter_item_commands_in_enumerate'} = '@node Top
 @top top
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 4aed729303..fe170d9b46 100644
--- a/tp/t/results/itemize/inter_item_commands_in_itemize.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
@@ -16,23 +16,28 @@ $result_trees{'inter_item_commands_in_itemize'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'inter_item_commands_in_itemize'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'inter_item_commands_in_itemize'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -113,24 +126,27 @@ $result_trees{'inter_item_commands_in_itemize'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -651,13 +667,13 @@ $result_trees{'inter_item_commands_in_itemize'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'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]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[6]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'inter_item_commands_in_itemize'} = '@node Top
 @top top
diff --git a/tp/t/results/languages/appendix_translated.pl 
b/tp/t/results/languages/appendix_translated.pl
index be20a33b3c..9729d6c210 100644
--- a/tp/t/results/languages/appendix_translated.pl
+++ b/tp/t/results/languages/appendix_translated.pl
@@ -53,23 +53,28 @@ $result_trees{'appendix_translated'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -84,24 +89,27 @@ $result_trees{'appendix_translated'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -119,24 +127,27 @@ $result_trees{'appendix_translated'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'dernier'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'dernier'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/languages/command_translated.pl 
b/tp/t/results/languages/command_translated.pl
index c7a59159cb..f7a7755fa1 100644
--- a/tp/t/results/languages/command_translated.pl
+++ b/tp/t/results/languages/command_translated.pl
@@ -53,23 +53,28 @@ $result_trees{'command_translated'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -84,35 +89,38 @@ $result_trees{'command_translated'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top '
-            },
-            {
-              'cmdname' => 'error',
               'contents' => [
                 {
-                  'type' => 'brace_container'
+                  'text' => 'top '
+                },
+                {
+                  'cmdname' => 'error',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 4
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 4
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -155,34 +163,39 @@ $result_trees{'command_translated'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter '
-            },
-            {
-              'cmdname' => 'error',
               'contents' => [
                 {
-                  'type' => 'brace_container'
+                  'text' => 'chapter '
+                },
+                {
+                  'cmdname' => 'error',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 8
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 8
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-error_002d_002d_003e'
@@ -197,23 +210,28 @@ $result_trees{'command_translated'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
diff --git a/tp/t/results/languages/documentlanguage.pl 
b/tp/t/results/languages/documentlanguage.pl
index 054c874d00..ee3aa4ac12 100644
--- a/tp/t/results/languages/documentlanguage.pl
+++ b/tp/t/results/languages/documentlanguage.pl
@@ -254,23 +254,28 @@ $result_trees{'documentlanguage'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -286,24 +291,27 @@ $result_trees{'documentlanguage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -322,23 +330,28 @@ $result_trees{'documentlanguage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -355,24 +368,27 @@ $result_trees{'documentlanguage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -734,8 +750,8 @@ $result_trees{'documentlanguage'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'documentlanguage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'documentlanguage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'documentlanguage'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'documentlanguage'}{'contents'}[3];
+$result_trees{'documentlanguage'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'documentlanguage'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'documentlanguage'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'documentlanguage'}{'contents'}[3];
 
 $result_texis{'documentlanguage'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/languages/documentlanguage_generated_master_menu.pl 
b/tp/t/results/languages/documentlanguage_generated_master_menu.pl
index f96575e36c..e255c8d7a1 100644
--- a/tp/t/results/languages/documentlanguage_generated_master_menu.pl
+++ b/tp/t/results/languages/documentlanguage_generated_master_menu.pl
@@ -88,23 +88,28 @@ $result_trees{'documentlanguage_generated_master_menu'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -119,24 +124,27 @@ $result_trees{'documentlanguage_generated_master_menu'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -154,24 +162,27 @@ $result_trees{'documentlanguage_generated_master_menu'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Part I'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Part I'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -189,23 +200,28 @@ $result_trees{'documentlanguage_generated_master_menu'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -220,24 +236,27 @@ $result_trees{'documentlanguage_generated_master_menu'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -293,24 +312,27 @@ $result_trees{'documentlanguage_generated_master_menu'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Part II'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Part II'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -328,23 +350,28 @@ $result_trees{'documentlanguage_generated_master_menu'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'other chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'other chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'other-chap'
@@ -359,24 +386,27 @@ $result_trees{'documentlanguage_generated_master_menu'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Other chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Other chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -432,23 +462,28 @@ $result_trees{'documentlanguage_generated_master_menu'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'appendix'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'appendix'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'appendix'
@@ -463,23 +498,28 @@ $result_trees{'documentlanguage_generated_master_menu'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'App'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'App'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'appendix',
       'extra' => {
         'section_number' => 'A'
       },
diff --git a/tp/t/results/languages/documentlanguage_option.pl 
b/tp/t/results/languages/documentlanguage_option.pl
index 4ecf7dd4a0..264ddb5142 100644
--- a/tp/t/results/languages/documentlanguage_option.pl
+++ b/tp/t/results/languages/documentlanguage_option.pl
@@ -254,23 +254,28 @@ $result_trees{'documentlanguage_option'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -286,24 +291,27 @@ $result_trees{'documentlanguage_option'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -322,23 +330,28 @@ $result_trees{'documentlanguage_option'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -355,24 +368,27 @@ $result_trees{'documentlanguage_option'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -734,8 +750,8 @@ $result_trees{'documentlanguage_option'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'documentlanguage_option'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'documentlanguage_option'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'documentlanguage_option'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'documentlanguage_option'}{'contents'}[3];
+$result_trees{'documentlanguage_option'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'documentlanguage_option'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'documentlanguage_option'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'documentlanguage_option'}{'contents'}[3];
 
 $result_texis{'documentlanguage_option'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/languages/documentlanguage_unknown.pl 
b/tp/t/results/languages/documentlanguage_unknown.pl
index e2b0feeb78..99aa3b7151 100644
--- a/tp/t/results/languages/documentlanguage_unknown.pl
+++ b/tp/t/results/languages/documentlanguage_unknown.pl
@@ -254,23 +254,28 @@ $result_trees{'documentlanguage_unknown'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -286,24 +291,27 @@ $result_trees{'documentlanguage_unknown'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -322,23 +330,28 @@ $result_trees{'documentlanguage_unknown'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -355,24 +368,27 @@ $result_trees{'documentlanguage_unknown'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -734,8 +750,8 @@ $result_trees{'documentlanguage_unknown'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'documentlanguage_unknown'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'documentlanguage_unknown'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'documentlanguage_unknown'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'documentlanguage_unknown'}{'contents'}[3];
+$result_trees{'documentlanguage_unknown'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'documentlanguage_unknown'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'documentlanguage_unknown'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'documentlanguage_unknown'}{'contents'}[3];
 
 $result_texis{'documentlanguage_unknown'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/languages/multiple_documentlanguage.pl 
b/tp/t/results/languages/multiple_documentlanguage.pl
index 047e80a689..84fe79de3a 100644
--- a/tp/t/results/languages/multiple_documentlanguage.pl
+++ b/tp/t/results/languages/multiple_documentlanguage.pl
@@ -348,23 +348,28 @@ $result_trees{'multiple_documentlanguage'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -379,24 +384,27 @@ $result_trees{'multiple_documentlanguage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -414,23 +422,28 @@ $result_trees{'multiple_documentlanguage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -446,24 +459,27 @@ $result_trees{'multiple_documentlanguage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1111,8 +1127,8 @@ $result_trees{'multiple_documentlanguage'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_documentlanguage'}{'contents'}[3];
-$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_documentlanguage'}{'contents'}[3];
+$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_documentlanguage'}{'contents'}[3];
+$result_trees{'multiple_documentlanguage'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_documentlanguage'}{'contents'}[3];
 
 $result_texis{'multiple_documentlanguage'} = '@documentlanguage fr
 
diff --git a/tp/t/results/languages/multiple_in_preamble.pl 
b/tp/t/results/languages/multiple_in_preamble.pl
index f74766443b..63b7ff7de4 100644
--- a/tp/t/results/languages/multiple_in_preamble.pl
+++ b/tp/t/results/languages/multiple_in_preamble.pl
@@ -383,23 +383,28 @@ $result_trees{'multiple_in_preamble'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -414,24 +419,27 @@ $result_trees{'multiple_in_preamble'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -449,23 +457,28 @@ $result_trees{'multiple_in_preamble'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -480,24 +493,27 @@ $result_trees{'multiple_in_preamble'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1010,8 +1026,8 @@ $result_trees{'multiple_in_preamble'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_in_preamble'}{'contents'}[3];
-$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_in_preamble'}{'contents'}[3];
+$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_in_preamble'}{'contents'}[3];
+$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_in_preamble'}{'contents'}[3];
 
 $result_texis{'multiple_in_preamble'} = '@documentlanguage fr
 
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 3250a4efff..254da3e5b8 100644
--- a/tp/t/results/languages/multiple_in_preamble_before_node.pl
+++ b/tp/t/results/languages/multiple_in_preamble_before_node.pl
@@ -432,23 +432,28 @@ $result_trees{'multiple_in_preamble_before_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -463,24 +468,27 @@ $result_trees{'multiple_in_preamble_before_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -498,23 +506,28 @@ $result_trees{'multiple_in_preamble_before_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -529,24 +542,27 @@ $result_trees{'multiple_in_preamble_before_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -806,7 +822,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_in_preamble_before_node'}{'contents'}[3];
+$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_in_preamble_before_node'}{'contents'}[3];
 
 $result_texis{'multiple_in_preamble_before_node'} = '@documentlanguage fr
 
diff --git a/tp/t/results/languages/multiple_lang_chapters.pl 
b/tp/t/results/languages/multiple_lang_chapters.pl
index d3f6fb7432..a6c8e1c210 100644
--- a/tp/t/results/languages/multiple_lang_chapters.pl
+++ b/tp/t/results/languages/multiple_lang_chapters.pl
@@ -236,23 +236,28 @@ $result_trees{'multiple_lang_chapters'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -267,24 +272,27 @@ $result_trees{'multiple_lang_chapters'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Multi language file'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Multi language file'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -619,23 +627,28 @@ $result_trees{'multiple_lang_chapters'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter ja'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter ja'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-ja'
@@ -650,24 +663,27 @@ $result_trees{'multiple_lang_chapters'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'ja'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'ja'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -971,23 +987,28 @@ $result_trees{'multiple_lang_chapters'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter en'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter en'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-en'
@@ -1002,24 +1023,27 @@ $result_trees{'multiple_lang_chapters'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'en'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'en'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1323,23 +1347,28 @@ $result_trees{'multiple_lang_chapters'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter fr_FR'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter fr_FR'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-fr_005fFR'
@@ -1354,24 +1383,27 @@ $result_trees{'multiple_lang_chapters'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'fr_FR'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'fr_FR'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1639,23 +1671,28 @@ $result_trees{'multiple_lang_chapters'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter de'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter de'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-de'
@@ -1670,24 +1707,27 @@ $result_trees{'multiple_lang_chapters'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'de'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'de'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1737,23 +1777,28 @@ $result_trees{'multiple_lang_chapters'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter pt_BR'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter pt_BR'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-pt_005fBR'
@@ -1768,24 +1813,27 @@ $result_trees{'multiple_lang_chapters'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'pt_bR'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'pt_bR'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1843,17 +1891,17 @@ $result_trees{'multiple_lang_chapters'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$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'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$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'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_lang_chapters'}{'contents'}[7];
-$result_trees{'multiple_lang_chapters'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_lang_chapters'}{'contents'}[3];
+$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_lang_chapters'}{'contents'}[5];
+$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_lang_chapters'}{'contents'}[7];
+$result_trees{'multiple_lang_chapters'}{'contents'}[12]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[12]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'multiple_lang_chapters'} = '
 @documentencoding utf-8
diff --git a/tp/t/results/languages/multiple_lang_chapters_latex.pl 
b/tp/t/results/languages/multiple_lang_chapters_latex.pl
index 0d4795786c..328efea08e 100644
--- a/tp/t/results/languages/multiple_lang_chapters_latex.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_latex.pl
@@ -236,23 +236,28 @@ $result_trees{'multiple_lang_chapters_latex'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -267,24 +272,27 @@ $result_trees{'multiple_lang_chapters_latex'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Multi language file'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Multi language file'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -619,23 +627,28 @@ $result_trees{'multiple_lang_chapters_latex'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter ja'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter ja'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-ja'
@@ -650,24 +663,27 @@ $result_trees{'multiple_lang_chapters_latex'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'ja'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'ja'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -971,23 +987,28 @@ $result_trees{'multiple_lang_chapters_latex'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter en'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter en'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-en'
@@ -1002,24 +1023,27 @@ $result_trees{'multiple_lang_chapters_latex'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'en'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'en'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1323,23 +1347,28 @@ $result_trees{'multiple_lang_chapters_latex'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter fr_FR'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter fr_FR'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-fr_005fFR'
@@ -1354,24 +1383,27 @@ $result_trees{'multiple_lang_chapters_latex'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'fr_FR'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'fr_FR'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1639,23 +1671,28 @@ $result_trees{'multiple_lang_chapters_latex'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter de'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter de'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-de'
@@ -1670,24 +1707,27 @@ $result_trees{'multiple_lang_chapters_latex'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'de'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'de'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1737,23 +1777,28 @@ $result_trees{'multiple_lang_chapters_latex'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter pt_BR'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter pt_BR'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-pt_005fBR'
@@ -1768,24 +1813,27 @@ $result_trees{'multiple_lang_chapters_latex'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'pt_bR'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'pt_bR'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1843,17 +1891,17 @@ $result_trees{'multiple_lang_chapters_latex'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$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'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$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'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[7];
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[3];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[5];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[7];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[12]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[12]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'multiple_lang_chapters_latex'} = '
 @documentencoding utf-8
diff --git a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl 
b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
index 9afb49263d..b00523c272 100644
--- a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
@@ -203,23 +203,28 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -234,24 +239,27 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Multi language file'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Multi language file'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -586,23 +594,28 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter ja'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter ja'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-ja'
@@ -617,24 +630,27 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'ja'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'ja'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -938,23 +954,28 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter en'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter en'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-en'
@@ -969,24 +990,27 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'en'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'en'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1290,23 +1314,28 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter fr_FR'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter fr_FR'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-fr_005fFR'
@@ -1321,24 +1350,27 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'fr_FR'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'fr_FR'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1606,23 +1638,28 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter de'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter de'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-de'
@@ -1637,24 +1674,27 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'de'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'de'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1704,23 +1744,28 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter pt_BR'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter pt_BR'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-pt_005fBR'
@@ -1735,24 +1780,27 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'pt_bR'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'pt_bR'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1810,17 +1858,17 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$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'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$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'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[7];
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[3];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[5];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[7];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[12]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[12]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'multiple_lang_chapters_texi2html'} = '
 @documentencoding utf-8
diff --git a/tp/t/results/languages/simple_documentlanguage.pl 
b/tp/t/results/languages/simple_documentlanguage.pl
index ed2e356804..c2383ecb64 100644
--- a/tp/t/results/languages/simple_documentlanguage.pl
+++ b/tp/t/results/languages/simple_documentlanguage.pl
@@ -53,23 +53,28 @@ $result_trees{'simple_documentlanguage'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -84,24 +89,27 @@ $result_trees{'simple_documentlanguage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -337,7 +345,7 @@ $result_trees{'simple_documentlanguage'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'simple_documentlanguage'}{'contents'}[2];
 
 $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 a119d1a337..c75d496f7c 100644
--- a/tp/t/results/languages/unknown_language.pl
+++ b/tp/t/results/languages/unknown_language.pl
@@ -53,23 +53,28 @@ $result_trees{'unknown_language'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -84,24 +89,27 @@ $result_trees{'unknown_language'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unknkown language'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unknkown language'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -119,23 +127,28 @@ $result_trees{'unknown_language'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -150,24 +163,27 @@ $result_trees{'unknown_language'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -301,8 +317,8 @@ $result_trees{'unknown_language'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'unknown_language'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'unknown_language'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'unknown_language'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'unknown_language'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'unknown_language'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'unknown_language'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'unknown_language'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'unknown_language'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'unknown_language'} = '@documentlanguage unknown
 
diff --git a/tp/t/results/languages/unknown_region.pl 
b/tp/t/results/languages/unknown_region.pl
index 71352fb861..003ca683f2 100644
--- a/tp/t/results/languages/unknown_region.pl
+++ b/tp/t/results/languages/unknown_region.pl
@@ -53,23 +53,28 @@ $result_trees{'unknown_region'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -84,24 +89,27 @@ $result_trees{'unknown_region'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -337,7 +345,7 @@ $result_trees{'unknown_region'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'unknown_region'}{'contents'}[2];
 
 $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 0e454fff1c..57f992ba85 100644
--- a/tp/t/results/latex_tests/anchor_before_top.pl
+++ b/tp/t/results/latex_tests/anchor_before_top.pl
@@ -56,23 +56,28 @@ $result_trees{'anchor_before_top'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -87,24 +92,27 @@ $result_trees{'anchor_before_top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -122,23 +130,28 @@ $result_trees{'anchor_before_top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Chapter'
@@ -153,24 +166,27 @@ $result_trees{'anchor_before_top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -225,7 +241,7 @@ $result_trees{'anchor_before_top'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'anchor_before_top'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_before_top'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'anchor_before_top'} = '
 @anchor{a before Top}
diff --git a/tp/t/results/latex_tests/anchor_in_copying.pl 
b/tp/t/results/latex_tests/anchor_in_copying.pl
index 5f49c52ce6..e818b87931 100644
--- a/tp/t/results/latex_tests/anchor_in_copying.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying.pl
@@ -110,23 +110,28 @@ $result_trees{'anchor_in_copying'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -141,24 +146,27 @@ $result_trees{'anchor_in_copying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -176,23 +184,28 @@ $result_trees{'anchor_in_copying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Chapter'
@@ -207,24 +220,27 @@ $result_trees{'anchor_in_copying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -279,7 +295,7 @@ $result_trees{'anchor_in_copying'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_copying'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_copying'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'anchor_in_copying'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_copying'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'anchor_in_copying'} = '@copying
 Cop. @anchor{a in copying}. Ying.
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 80f92c8039..1dbd77b45e 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
@@ -110,23 +110,28 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -141,24 +146,27 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -176,23 +184,28 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Chapter'
@@ -207,24 +220,27 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -336,8 +352,8 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'anchor_in_copying_insertcopying_chap'} = '@copying
 Cop. @anchor{a in copying}. Ying.
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 180cb832d6..0ef127bb4a 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
@@ -251,23 +251,28 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -282,24 +287,27 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -317,23 +325,28 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Chapter'
@@ -348,24 +361,27 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -448,8 +464,8 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'anchor_in_copying_insertcopying_titlepage'} = '@copying
 Cop. @anchor{a in copying}. Ying.
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 d4d42dcdbe..df56b4128b 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
@@ -223,23 +223,28 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -254,24 +259,27 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -289,23 +297,28 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Chapter'
@@ -320,24 +333,27 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -449,8 +465,8 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'anchor_in_copying_insertcopying_titlepage_chap'} = '@copying
 Cop. @anchor{a in copying}. Ying.
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 c0fb56a034..9a597594c3 100644
--- a/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
@@ -16,24 +16,27 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node before'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node before'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -93,23 +96,28 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -124,24 +132,27 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top sectionning'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top sectionning'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -198,24 +209,27 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'after'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'after'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -275,23 +289,28 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -306,24 +325,27 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -687,14 +709,14 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0];
-$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[0];
-$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[7]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[7]{'contents'}[4]{'contents'}[0]{'contents'}[0];
-$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[7]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[7]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[5]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[5]{'contents'}[4]{'contents'}[0]{'contents'}[0];
+$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[5]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[5]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[8]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[8]{'contents'}[4]{'contents'}[0]{'contents'}[0];
+$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[8]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'}{'contents'}[6]{'contents'}[8]{'contents'}[6]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'anchor_links_xref_xrefautomaticsectiontitle'} = '@node node 
before
 
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 c0b7d086e0..5078e1aafc 100644
--- a/tp/t/results/latex_tests/custom_heading_with_include.pl
+++ b/tp/t/results/latex_tests/custom_heading_with_include.pl
@@ -106,23 +106,28 @@ $result_trees{'custom_heading_with_include'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -137,24 +142,27 @@ $result_trees{'custom_heading_with_include'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top sectionning'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top sectionning'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -191,23 +199,28 @@ $result_trees{'custom_heading_with_include'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'in main'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'in main'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'in-main'
@@ -222,24 +235,27 @@ $result_trees{'custom_heading_with_include'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap in main'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap in main'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -442,23 +458,28 @@ $result_trees{'custom_heading_with_include'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter in included file'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter in included file'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Chapter-in-included-file'
@@ -474,24 +495,27 @@ $result_trees{'custom_heading_with_include'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter in included file'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter in included file'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -618,23 +642,28 @@ $result_trees{'custom_heading_with_include'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Section'
@@ -650,24 +679,27 @@ $result_trees{'custom_heading_with_include'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -794,23 +826,28 @@ $result_trees{'custom_heading_with_include'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Subsection'
@@ -826,24 +863,27 @@ $result_trees{'custom_heading_with_include'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'source_marks' => [
             {
@@ -1105,24 +1145,27 @@ $result_trees{'custom_heading_with_include'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter in included file'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter in included file'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1143,24 +1186,27 @@ $result_trees{'custom_heading_with_include'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1181,24 +1227,27 @@ $result_trees{'custom_heading_with_include'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'source_marks' => [
             {
@@ -1356,24 +1405,27 @@ $result_trees{'custom_heading_with_include'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter in included file Include'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter in included file Include'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1394,24 +1446,27 @@ $result_trees{'custom_heading_with_include'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section Include'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section Include'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1432,24 +1487,27 @@ $result_trees{'custom_heading_with_include'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Subsection Include'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Subsection Include'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'source_marks' => [
             {
@@ -1609,24 +1667,27 @@ $result_trees{'custom_heading_with_include'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter in included file'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter in included file'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1647,24 +1708,27 @@ $result_trees{'custom_heading_with_include'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1685,24 +1749,27 @@ $result_trees{'custom_heading_with_include'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'source_marks' => [
             {
@@ -1873,24 +1940,27 @@ $result_trees{'custom_heading_with_include'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter in included file'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter in included file'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1911,24 +1981,27 @@ $result_trees{'custom_heading_with_include'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1949,24 +2022,27 @@ $result_trees{'custom_heading_with_include'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'source_marks' => [
             {
@@ -2081,23 +2157,28 @@ $result_trees{'custom_heading_with_include'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'last chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'last chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'last-chap'
@@ -2112,24 +2193,27 @@ $result_trees{'custom_heading_with_include'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'A last'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'A last'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2151,8 +2235,8 @@ $result_trees{'custom_heading_with_include'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'custom_heading_with_include'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'custom_heading_with_include'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'custom_heading_with_include'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'custom_heading_with_include'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'custom_heading_with_include'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'custom_heading_with_include'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'custom_heading_with_include'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'custom_heading_with_include'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'custom_heading_with_include'} = '@setchapternewpage odd
 @everyheading @thispage @| @thisfile @| @thischapter
diff --git a/tp/t/results/latex_tests/custom_heading_with_include_in_command.pl 
b/tp/t/results/latex_tests/custom_heading_with_include_in_command.pl
index c6328f5f67..648ee9f6e2 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
@@ -119,23 +119,28 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -150,24 +155,27 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top sectionning'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top sectionning'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -204,23 +212,28 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'in main'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'in main'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'in-main'
@@ -235,24 +248,27 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap in main'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap in main'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -455,23 +471,28 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter in included file'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter in included file'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Chapter-in-included-file'
@@ -487,24 +508,27 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter in included file'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter in included file'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -631,23 +655,28 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Section'
@@ -663,24 +692,27 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -807,23 +839,28 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Subsection'
@@ -839,24 +876,27 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'source_marks' => [
             {
@@ -1118,24 +1158,27 @@ $result_trees{'custom_heading_with_include_in_command'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter in included file'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter in included file'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1156,24 +1199,27 @@ $result_trees{'custom_heading_with_include_in_command'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1194,24 +1240,27 @@ $result_trees{'custom_heading_with_include_in_command'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'source_marks' => [
             {
@@ -1369,24 +1418,27 @@ $result_trees{'custom_heading_with_include_in_command'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter in included file Include'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter in included file Include'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1407,24 +1459,27 @@ $result_trees{'custom_heading_with_include_in_command'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section Include'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section Include'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1445,24 +1500,27 @@ $result_trees{'custom_heading_with_include_in_command'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Subsection Include'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Subsection Include'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'source_marks' => [
             {
@@ -1622,24 +1680,27 @@ $result_trees{'custom_heading_with_include_in_command'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter in included file'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter in included file'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1660,24 +1721,27 @@ $result_trees{'custom_heading_with_include_in_command'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1698,24 +1762,27 @@ $result_trees{'custom_heading_with_include_in_command'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'source_marks' => [
             {
@@ -1886,24 +1953,27 @@ $result_trees{'custom_heading_with_include_in_command'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter in included file'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter in included file'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1924,24 +1994,27 @@ $result_trees{'custom_heading_with_include_in_command'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1962,24 +2035,27 @@ $result_trees{'custom_heading_with_include_in_command'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'source_marks' => [
             {
@@ -2094,23 +2170,28 @@ $result_trees{'custom_heading_with_include_in_command'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'last chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'last chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'last-chap'
@@ -2125,24 +2206,27 @@ $result_trees{'custom_heading_with_include_in_command'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'A last'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'A last'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2164,8 +2248,8 @@ $result_trees{'custom_heading_with_include_in_command'} = 
{
   ],
   'type' => 'document_root'
 };
-$result_trees{'custom_heading_with_include_in_command'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'custom_heading_with_include_in_command'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'custom_heading_with_include_in_command'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'custom_heading_with_include_in_command'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'custom_heading_with_include_in_command'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'custom_heading_with_include_in_command'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'custom_heading_with_include_in_command'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'custom_heading_with_include_in_command'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'custom_heading_with_include_in_command'} = '@setchapternewpage 
odd
 @everyheading @thischapter @emph{@thisfile} @| @| @thispage
diff --git a/tp/t/results/latex_tests/custom_headings.pl 
b/tp/t/results/latex_tests/custom_headings.pl
index b2bc3b0611..f0a155721a 100644
--- a/tp/t/results/latex_tests/custom_headings.pl
+++ b/tp/t/results/latex_tests/custom_headings.pl
@@ -172,23 +172,28 @@ $result_trees{'custom_headings'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -203,24 +208,27 @@ $result_trees{'custom_headings'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top sectionning'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top sectionning'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -238,23 +246,28 @@ $result_trees{'custom_headings'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -269,24 +282,27 @@ $result_trees{'custom_headings'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'ch--ap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'ch--ap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -364,24 +380,27 @@ $result_trees{'custom_headings'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -401,24 +420,27 @@ $result_trees{'custom_headings'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -534,24 +556,27 @@ $result_trees{'custom_headings'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/latex_tests/custom_headings_and_comments.pl 
b/tp/t/results/latex_tests/custom_headings_and_comments.pl
index db529d845d..a5ea99b4c8 100644
--- a/tp/t/results/latex_tests/custom_headings_and_comments.pl
+++ b/tp/t/results/latex_tests/custom_headings_and_comments.pl
@@ -171,23 +171,28 @@ $result_trees{'custom_headings_and_comments'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -202,24 +207,27 @@ $result_trees{'custom_headings_and_comments'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top sectionning'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top sectionning'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -237,23 +245,28 @@ $result_trees{'custom_headings_and_comments'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -268,24 +281,27 @@ $result_trees{'custom_headings_and_comments'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'ch--ap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'ch--ap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -363,24 +379,27 @@ $result_trees{'custom_headings_and_comments'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -400,24 +419,27 @@ $result_trees{'custom_headings_and_comments'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/latex_tests/customize_informative_commands.pl 
b/tp/t/results/latex_tests/customize_informative_commands.pl
index 0cb6997b08..2cc2242354 100644
--- a/tp/t/results/latex_tests/customize_informative_commands.pl
+++ b/tp/t/results/latex_tests/customize_informative_commands.pl
@@ -16,23 +16,28 @@ $result_trees{'customize_informative_commands'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
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 da1c8a1114..f5ea4d0d59 100644
--- a/tp/t/results/latex_tests/error_in_sectioning_command.pl
+++ b/tp/t/results/latex_tests/error_in_sectioning_command.pl
@@ -37,23 +37,28 @@ $result_trees{'error_in_sectioning_command'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -68,24 +73,27 @@ $result_trees{'error_in_sectioning_command'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -103,62 +111,67 @@ $result_trees{'error_in_sectioning_command'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'code',
               'contents' => [
                 {
+                  'cmdname' => 'code',
                   'contents' => [
                     {
-                      'cmdname' => '@'
-                    },
-                    {
-                      'text' => 'error'
-                    },
-                    {
-                      'cmdname' => '{'
-                    },
+                      'contents' => [
+                        {
+                          'cmdname' => '@'
+                        },
+                        {
+                          'text' => 'error'
+                        },
+                        {
+                          'cmdname' => '{'
+                        },
+                        {
+                          'cmdname' => '}'
+                        }
+                      ],
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 6
+                  }
+                },
+                {
+                  'text' => ' ('
+                },
+                {
+                  'cmdname' => 'error',
+                  'contents' => [
                     {
-                      'cmdname' => '}'
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 6
-              }
-            },
-            {
-              'text' => ' ('
-            },
-            {
-              'cmdname' => 'error',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 6
+                  }
+                },
                 {
-                  'type' => 'brace_container'
+                  'text' => '): Indicating an Error Message'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 6
-              }
-            },
-            {
-              'text' => '): Indicating an Error Message'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 
'_0040error_007b_007d-_0028error_002d_002d_003e_0029_003a-Indicating-an-Error-Message'
@@ -173,63 +186,66 @@ $result_trees{'error_in_sectioning_command'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'code',
               'contents' => [
                 {
+                  'cmdname' => 'code',
                   'contents' => [
                     {
-                      'cmdname' => '@'
-                    },
-                    {
-                      'text' => 'error'
-                    },
-                    {
-                      'cmdname' => '{'
-                    },
+                      'contents' => [
+                        {
+                          'cmdname' => '@'
+                        },
+                        {
+                          'text' => 'error'
+                        },
+                        {
+                          'cmdname' => '{'
+                        },
+                        {
+                          'cmdname' => '}'
+                        }
+                      ],
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 7
+                  }
+                },
+                {
+                  'text' => ' ('
+                },
+                {
+                  'cmdname' => 'error',
+                  'contents' => [
                     {
-                      'cmdname' => '}'
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 7
-              }
-            },
-            {
-              'text' => ' ('
-            },
-            {
-              'cmdname' => 'error',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 7
+                  }
+                },
                 {
-                  'type' => 'brace_container'
+                  'text' => '): Indicating an Error Message'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 7
-              }
-            },
-            {
-              'text' => '): Indicating an Error Message'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/latex_tests/float_and_refs.pl 
b/tp/t/results/latex_tests/float_and_refs.pl
index 3235995ff9..f5579def87 100644
--- a/tp/t/results/latex_tests/float_and_refs.pl
+++ b/tp/t/results/latex_tests/float_and_refs.pl
@@ -16,23 +16,28 @@ $result_trees{'float_and_refs'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'float_and_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'float_and_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -113,24 +126,27 @@ $result_trees{'float_and_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -604,24 +620,27 @@ $result_trees{'float_and_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'refs'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'refs'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1475,24 +1494,27 @@ $result_trees{'float_and_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'lists'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'lists'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1599,36 +1621,36 @@ $result_trees{'float_and_refs'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'extra'}{'float'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[1];
-$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'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'}[2];
-$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'}{'shortcaption'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[4];
-$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'extra'}{'float'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[3];
-$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[4]{'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'}[2];
-$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'}{'shortcaption'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[4];
-$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'extra'}{'float'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5];
-$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'contents'}[4]{'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'}[2];
-$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'}{'shortcaption'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'contents'}[4];
-$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[1]{'contents'}[8]{'contents'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[3]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[3]{'contents'}[4]{'contents'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[3]{'contents'}[8]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[3]{'contents'}[8]{'contents'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[5]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[5]{'contents'}[4]{'contents'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[5]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[5]{'contents'}[6]{'contents'}[0]{'contents'}[0];
-$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[5]{'contents'}[8]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[5]{'contents'}[8]{'contents'}[0]{'contents'}[0];
+$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'extra'}{'float'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[2];
+$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'extra'}{'float'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[2];
+$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[2]{'extra'}{'caption'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[2]{'contents'}[2];
+$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[2]{'extra'}{'float_section'}
 = $result_trees{'float_and_refs'}{'contents'}[4];
+$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[2]{'extra'}{'shortcaption'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[2]{'contents'}[4];
+$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'extra'}{'float'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[4];
+$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'extra'}{'float'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[4];
+$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[4]{'extra'}{'caption'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[4]{'contents'}[2];
+$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[4]{'extra'}{'float_section'}
 = $result_trees{'float_and_refs'}{'contents'}[4];
+$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[4]{'extra'}{'shortcaption'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[4]{'contents'}[4];
+$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'extra'}{'float'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[6];
+$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[6]{'contents'}[4]{'extra'}{'float'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[6];
+$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[6]{'extra'}{'caption'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[6]{'contents'}[2];
+$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[6]{'extra'}{'float_section'}
 = $result_trees{'float_and_refs'}{'contents'}[4];
+$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[6]{'extra'}{'shortcaption'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[6]{'contents'}[4];
+$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0];
+$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[2]{'contents'}[8]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[2]{'contents'}[8]{'contents'}[0]{'contents'}[0];
+$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0];
+$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[4]{'contents'}[8]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[4]{'contents'}[8]{'contents'}[0]{'contents'}[0];
+$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[6]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[6]{'contents'}[4]{'contents'}[0]{'contents'}[0];
+$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[6]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[6]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[6]{'contents'}[8]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[5]{'contents'}[6]{'contents'}[8]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'float_and_refs'} = '@node Top
 @top top
diff --git a/tp/t/results/latex_tests/fonttextsize.pl 
b/tp/t/results/latex_tests/fonttextsize.pl
index f3a22a8863..eefe75da85 100644
--- a/tp/t/results/latex_tests/fonttextsize.pl
+++ b/tp/t/results/latex_tests/fonttextsize.pl
@@ -55,23 +55,28 @@ $result_trees{'fonttextsize'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -86,24 +91,27 @@ $result_trees{'fonttextsize'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -121,23 +129,28 @@ $result_trees{'fonttextsize'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -152,24 +165,27 @@ $result_trees{'fonttextsize'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -189,24 +205,27 @@ $result_trees{'fonttextsize'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -226,24 +245,27 @@ $result_trees{'fonttextsize'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Subsection 10pts'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Subsection 10pts'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -304,24 +326,27 @@ $result_trees{'fonttextsize'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Subsection 11pts'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Subsection 11pts'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -382,24 +407,27 @@ $result_trees{'fonttextsize'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Subsection 8pts'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Subsection 8pts'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -460,24 +488,27 @@ $result_trees{'fonttextsize'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Subsection 15pts'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Subsection 15pts'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/latex_tests/indices.pl 
b/tp/t/results/latex_tests/indices.pl
index 6de54f07dc..390f4c0870 100644
--- a/tp/t/results/latex_tests/indices.pl
+++ b/tp/t/results/latex_tests/indices.pl
@@ -50,23 +50,28 @@ $result_trees{'indices'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -81,24 +86,27 @@ $result_trees{'indices'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -116,23 +124,28 @@ $result_trees{'indices'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -148,24 +161,27 @@ $result_trees{'indices'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1096,20 +1112,20 @@ $result_trees{'indices'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'indices'}{'contents'}[3];
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[2]{'extra'}{'element_node'} 
= $result_trees{'indices'}{'contents'}[3];
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'} 
= $result_trees{'indices'}{'contents'}[3];
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'} 
= $result_trees{'indices'}{'contents'}[3];
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[5]{'extra'}{'element_node'} 
= $result_trees{'indices'}{'contents'}[3];
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[6]{'extra'}{'element_node'} 
= $result_trees{'indices'}{'contents'}[3];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'indices'}{'contents'}[3];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'}{'args'}[0]{'contents'}[11]
 = $result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'extra'}{'seealso'};
-$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'indices'}{'contents'}[4]{'contents'}[8];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[9] = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'};
-$result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'indices'}{'contents'}[3];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'indices'}{'contents'}[3];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'indices'}{'contents'}[3];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[9]{'extra'}{'subentry'}{'args'}[0]{'contents'}[11]
 = $result_trees{'indices'}{'contents'}[4]{'contents'}[9]{'extra'}{'seealso'};
+$result_trees{'indices'}{'contents'}[4]{'contents'}[9]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'indices'}{'contents'}[4]{'contents'}[9];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[10] = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[9]{'extra'}{'subentry'};
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'indices'}{'contents'}[3];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[15]{'extra'}{'element_node'}
 = $result_trees{'indices'}{'contents'}[3];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[17]{'extra'}{'element_node'}
 = $result_trees{'indices'}{'contents'}[3];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'indices'}{'contents'}[3];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[16]{'extra'}{'element_node'}
 = $result_trees{'indices'}{'contents'}[3];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[18]{'extra'}{'element_node'}
 = $result_trees{'indices'}{'contents'}[3];
 
 $result_texis{'indices'} = '
 @set txiindexbackslashignore
diff --git a/tp/t/results/latex_tests/indices_disable_encoding.pl 
b/tp/t/results/latex_tests/indices_disable_encoding.pl
index 178cc5bbaa..39c1fbbf55 100644
--- a/tp/t/results/latex_tests/indices_disable_encoding.pl
+++ b/tp/t/results/latex_tests/indices_disable_encoding.pl
@@ -50,23 +50,28 @@ $result_trees{'indices_disable_encoding'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -81,24 +86,27 @@ $result_trees{'indices_disable_encoding'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -116,23 +124,28 @@ $result_trees{'indices_disable_encoding'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -148,24 +161,27 @@ $result_trees{'indices_disable_encoding'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Index'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Index'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1096,20 +1112,20 @@ $result_trees{'indices_disable_encoding'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[2]{'extra'}{'element_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
 
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
 
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
 
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
 
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
-$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[8]{'extra'}{'element_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
-$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'}{'args'}[0]{'contents'}[11]
 = 
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[8]{'extra'}{'seealso'};
-$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[8];
-$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[9] = 
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'};
-$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[10]{'extra'}{'element_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[9]{'extra'}{'element_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[9]{'extra'}{'subentry'}{'args'}[0]{'contents'}[11]
 = 
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[9]{'extra'}{'seealso'};
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[9]{'extra'}{'subentry'}{'extra'}{'subentry_parent'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[9];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[10] = 
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[9]{'extra'}{'subentry'};
 
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
-$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[15]{'extra'}{'element_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
-$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[17]{'extra'}{'element_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[16]{'extra'}{'element_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[18]{'extra'}{'element_node'}
 = $result_trees{'indices_disable_encoding'}{'contents'}[3];
 
 $result_texis{'indices_disable_encoding'} = '
 @set txiindexbackslashignore
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 99508a4860..3f12b91120 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
@@ -16,23 +16,28 @@ $result_trees{'informative_commands_in_top_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'informative_commands_in_top_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top sectionning'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top sectionning'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -226,23 +234,28 @@ $result_trees{'informative_commands_in_top_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'next node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'next node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'next-node'
@@ -257,24 +270,27 @@ $result_trees{'informative_commands_in_top_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/latex_tests/node_before_top.pl 
b/tp/t/results/latex_tests/node_before_top.pl
index 9e82d9ee7d..0b357abf9c 100644
--- a/tp/t/results/latex_tests/node_before_top.pl
+++ b/tp/t/results/latex_tests/node_before_top.pl
@@ -16,24 +16,27 @@ $result_trees{'node_before_top'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'before Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'before Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -54,23 +57,28 @@ $result_trees{'node_before_top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -85,24 +93,27 @@ $result_trees{'node_before_top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -120,23 +131,28 @@ $result_trees{'node_before_top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Chapter'
@@ -151,24 +167,27 @@ $result_trees{'node_before_top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -223,7 +242,7 @@ $result_trees{'node_before_top'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'node_before_top'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_before_top'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'node_before_top'}{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_before_top'}{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'node_before_top'} = '@node before Top
 
diff --git a/tp/t/results/latex_tests/pagesizes.pl 
b/tp/t/results/latex_tests/pagesizes.pl
index ae7e2200c8..c21a07b006 100644
--- a/tp/t/results/latex_tests/pagesizes.pl
+++ b/tp/t/results/latex_tests/pagesizes.pl
@@ -50,23 +50,28 @@ $result_trees{'pagesizes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -81,24 +86,27 @@ $result_trees{'pagesizes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -116,23 +124,28 @@ $result_trees{'pagesizes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -147,24 +160,27 @@ $result_trees{'pagesizes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -216,24 +232,27 @@ $result_trees{'pagesizes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'other pagesizes'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'other pagesizes'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/latex_tests/pagetype.pl 
b/tp/t/results/latex_tests/pagetype.pl
index a5687e3439..de1819882c 100644
--- a/tp/t/results/latex_tests/pagetype.pl
+++ b/tp/t/results/latex_tests/pagetype.pl
@@ -54,23 +54,28 @@ $result_trees{'pagetype'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -85,24 +90,27 @@ $result_trees{'pagetype'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -120,23 +128,28 @@ $result_trees{'pagetype'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -151,24 +164,27 @@ $result_trees{'pagetype'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -265,24 +281,27 @@ $result_trees{'pagetype'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'afourpaper reset'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'afourpaper reset'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/latex_tests/settitle_and_headings.pl 
b/tp/t/results/latex_tests/settitle_and_headings.pl
index 37d0d7a41a..a7cfe78c1b 100644
--- a/tp/t/results/latex_tests/settitle_and_headings.pl
+++ b/tp/t/results/latex_tests/settitle_and_headings.pl
@@ -93,24 +93,27 @@ $result_trees{'settitle_and_headings'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/latex_tests/shorttitlepage.pl 
b/tp/t/results/latex_tests/shorttitlepage.pl
index 6a8b18058e..9dfd867439 100644
--- a/tp/t/results/latex_tests/shorttitlepage.pl
+++ b/tp/t/results/latex_tests/shorttitlepage.pl
@@ -56,23 +56,28 @@ $result_trees{'shorttitlepage'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -87,24 +92,27 @@ $result_trees{'shorttitlepage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -122,23 +130,28 @@ $result_trees{'shorttitlepage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -153,24 +166,27 @@ $result_trees{'shorttitlepage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/latex_tests/titlepage_classical.pl 
b/tp/t/results/latex_tests/titlepage_classical.pl
index 7448aea977..f32d4fe776 100644
--- a/tp/t/results/latex_tests/titlepage_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_classical.pl
@@ -343,23 +343,28 @@ $result_trees{'titlepage_classical'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -374,24 +379,27 @@ $result_trees{'titlepage_classical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -409,23 +417,28 @@ $result_trees{'titlepage_classical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -440,24 +453,27 @@ $result_trees{'titlepage_classical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 0bcdbec66a..7488ef71a7 100644
--- a/tp/t/results/latex_tests/titlepage_in_top_node.pl
+++ b/tp/t/results/latex_tests/titlepage_in_top_node.pl
@@ -16,23 +16,28 @@ $result_trees{'titlepage_in_top_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'titlepage_in_top_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top sectionning'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top sectionning'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -180,23 +188,28 @@ $result_trees{'titlepage_in_top_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -211,24 +224,27 @@ $result_trees{'titlepage_in_top_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/latex_tests/titlepage_long_title.pl 
b/tp/t/results/latex_tests/titlepage_long_title.pl
index 2376515ae2..bc5f4eedd7 100644
--- a/tp/t/results/latex_tests/titlepage_long_title.pl
+++ b/tp/t/results/latex_tests/titlepage_long_title.pl
@@ -113,23 +113,28 @@ $result_trees{'titlepage_long_title'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -144,24 +149,27 @@ $result_trees{'titlepage_long_title'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -179,23 +187,28 @@ $result_trees{'titlepage_long_title'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -210,24 +223,27 @@ $result_trees{'titlepage_long_title'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/latex_tests/titlepage_no_author.pl 
b/tp/t/results/latex_tests/titlepage_no_author.pl
index 8cd9687aa8..d4d304fcc2 100644
--- a/tp/t/results/latex_tests/titlepage_no_author.pl
+++ b/tp/t/results/latex_tests/titlepage_no_author.pl
@@ -102,23 +102,28 @@ $result_trees{'titlepage_no_author'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -133,24 +138,27 @@ $result_trees{'titlepage_no_author'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -168,23 +176,28 @@ $result_trees{'titlepage_no_author'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -199,24 +212,27 @@ $result_trees{'titlepage_no_author'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/latex_tests/titlepage_no_title.pl 
b/tp/t/results/latex_tests/titlepage_no_title.pl
index 0ad9341397..bfacf6ff8a 100644
--- a/tp/t/results/latex_tests/titlepage_no_title.pl
+++ b/tp/t/results/latex_tests/titlepage_no_title.pl
@@ -131,23 +131,28 @@ $result_trees{'titlepage_no_title'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -162,24 +167,27 @@ $result_trees{'titlepage_no_title'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -197,23 +205,28 @@ $result_trees{'titlepage_no_title'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -228,24 +241,27 @@ $result_trees{'titlepage_no_title'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 c9e3fce8f3..7e8527d7cd 100644
--- a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
@@ -490,23 +490,28 @@ $result_trees{'titlepage_with_commands_classical'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -521,24 +526,27 @@ $result_trees{'titlepage_with_commands_classical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -556,23 +564,28 @@ $result_trees{'titlepage_with_commands_classical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -587,24 +600,27 @@ $result_trees{'titlepage_with_commands_classical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 c5246fdd0e..fa1da12e94 100644
--- a/tp/t/results/latex_tests/top_no_sectioning_command.pl
+++ b/tp/t/results/latex_tests/top_no_sectioning_command.pl
@@ -16,24 +16,27 @@ $result_trees{'top_no_sectioning_command'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -54,23 +57,28 @@ $result_trees{'top_no_sectioning_command'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Chapter'
@@ -85,24 +93,27 @@ $result_trees{'top_no_sectioning_command'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -157,7 +168,7 @@ $result_trees{'top_no_sectioning_command'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'top_no_sectioning_command'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_no_sectioning_command'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'top_no_sectioning_command'}{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_no_sectioning_command'}{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'top_no_sectioning_command'} = '@node Top
 
diff --git a/tp/t/results/layout/navigation.pl 
b/tp/t/results/layout/navigation.pl
index 521afe7c50..ef4b8af445 100644
--- a/tp/t/results/layout/navigation.pl
+++ b/tp/t/results/layout/navigation.pl
@@ -31,23 +31,28 @@ $result_trees{'navigation'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'navigation'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'File used for navigation testing'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'File used for navigation testing'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -205,23 +213,28 @@ $result_trees{'navigation'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -237,24 +250,27 @@ $result_trees{'navigation'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'First chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'First chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -381,23 +397,28 @@ $result_trees{'navigation'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -413,24 +434,27 @@ $result_trees{'navigation'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section in chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section in chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -743,23 +767,28 @@ $result_trees{'navigation'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'subsection'
@@ -775,24 +804,27 @@ $result_trees{'navigation'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sub section in section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sub section in section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -845,9 +877,9 @@ $result_trees{'navigation'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_chapter.pl 
b/tp/t/results/layout/navigation_chapter.pl
index 197cefc612..18ba3083b3 100644
--- a/tp/t/results/layout/navigation_chapter.pl
+++ b/tp/t/results/layout/navigation_chapter.pl
@@ -31,23 +31,28 @@ $result_trees{'navigation_chapter'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'navigation_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'File used for navigation testing'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'File used for navigation testing'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -205,23 +213,28 @@ $result_trees{'navigation_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -237,24 +250,27 @@ $result_trees{'navigation_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'First chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'First chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -381,23 +397,28 @@ $result_trees{'navigation_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -413,24 +434,27 @@ $result_trees{'navigation_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section in chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section in chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -743,23 +767,28 @@ $result_trees{'navigation_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'subsection'
@@ -775,24 +804,27 @@ $result_trees{'navigation_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sub section in section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sub section in section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -845,9 +877,9 @@ $result_trees{'navigation_chapter'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_chapter'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_chapter'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_chapter'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_chapter'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_chapter'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_chapter'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_chapter'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_chapter'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_chapter'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_chapter'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_chapter'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_chapter'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_chapter'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_chapter_no_header.pl 
b/tp/t/results/layout/navigation_chapter_no_header.pl
index af4902193f..492baa8b6b 100644
--- a/tp/t/results/layout/navigation_chapter_no_header.pl
+++ b/tp/t/results/layout/navigation_chapter_no_header.pl
@@ -31,23 +31,28 @@ $result_trees{'navigation_chapter_no_header'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'navigation_chapter_no_header'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'File used for navigation testing'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'File used for navigation testing'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -205,23 +213,28 @@ $result_trees{'navigation_chapter_no_header'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -237,24 +250,27 @@ $result_trees{'navigation_chapter_no_header'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'First chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'First chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -381,23 +397,28 @@ $result_trees{'navigation_chapter_no_header'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -413,24 +434,27 @@ $result_trees{'navigation_chapter_no_header'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section in chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section in chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -743,23 +767,28 @@ $result_trees{'navigation_chapter_no_header'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'subsection'
@@ -775,24 +804,27 @@ $result_trees{'navigation_chapter_no_header'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sub section in section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sub section in section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -845,9 +877,9 @@ $result_trees{'navigation_chapter_no_header'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_chapter_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_chapter_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_chapter_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_chapter_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_chapter_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_chapter_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_chapter_no_header'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_chapter_no_header'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_chapter_no_header'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_chapter_no_header'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_chapter_no_header'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_chapter_no_header'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_chapter_no_header'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_chapter_no_header_vertical.pl 
b/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
index d07be4b63c..0172ff484d 100644
--- a/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
@@ -31,23 +31,28 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'File used for navigation testing'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'File used for navigation testing'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -205,23 +213,28 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -237,24 +250,27 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'First chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'First chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -381,23 +397,28 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -413,24 +434,27 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section in chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section in chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -743,23 +767,28 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'subsection'
@@ -775,24 +804,27 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sub section in section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sub section in section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -845,9 +877,9 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_chapter_no_header_vertical'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_chapter_vertical.pl 
b/tp/t/results/layout/navigation_chapter_vertical.pl
index 716372da05..ec8398f609 100644
--- a/tp/t/results/layout/navigation_chapter_vertical.pl
+++ b/tp/t/results/layout/navigation_chapter_vertical.pl
@@ -31,23 +31,28 @@ $result_trees{'navigation_chapter_vertical'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'navigation_chapter_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'File used for navigation testing'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'File used for navigation testing'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -205,23 +213,28 @@ $result_trees{'navigation_chapter_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -237,24 +250,27 @@ $result_trees{'navigation_chapter_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'First chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'First chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -381,23 +397,28 @@ $result_trees{'navigation_chapter_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -413,24 +434,27 @@ $result_trees{'navigation_chapter_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section in chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section in chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -743,23 +767,28 @@ $result_trees{'navigation_chapter_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'subsection'
@@ -775,24 +804,27 @@ $result_trees{'navigation_chapter_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sub section in section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sub section in section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -845,9 +877,9 @@ $result_trees{'navigation_chapter_vertical'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_chapter_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_chapter_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_chapter_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_chapter_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_chapter_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_chapter_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_chapter_vertical'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_chapter_vertical'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_chapter_vertical'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_chapter_vertical'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_chapter_vertical'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_chapter_vertical'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_chapter_vertical'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_no_header.pl 
b/tp/t/results/layout/navigation_no_header.pl
index 73f1ebaf4f..341e6ab2ed 100644
--- a/tp/t/results/layout/navigation_no_header.pl
+++ b/tp/t/results/layout/navigation_no_header.pl
@@ -31,23 +31,28 @@ $result_trees{'navigation_no_header'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'navigation_no_header'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'File used for navigation testing'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'File used for navigation testing'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -205,23 +213,28 @@ $result_trees{'navigation_no_header'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -237,24 +250,27 @@ $result_trees{'navigation_no_header'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'First chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'First chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -381,23 +397,28 @@ $result_trees{'navigation_no_header'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -413,24 +434,27 @@ $result_trees{'navigation_no_header'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section in chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section in chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -743,23 +767,28 @@ $result_trees{'navigation_no_header'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'subsection'
@@ -775,24 +804,27 @@ $result_trees{'navigation_no_header'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sub section in section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sub section in section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -845,9 +877,9 @@ $result_trees{'navigation_no_header'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_no_header'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_no_header'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_no_header'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_no_header'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_no_header'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_no_header'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_no_header'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_no_header_vertical.pl 
b/tp/t/results/layout/navigation_no_header_vertical.pl
index 7da75eb672..e2b833f22e 100644
--- a/tp/t/results/layout/navigation_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_no_header_vertical.pl
@@ -31,23 +31,28 @@ $result_trees{'navigation_no_header_vertical'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'navigation_no_header_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'File used for navigation testing'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'File used for navigation testing'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -205,23 +213,28 @@ $result_trees{'navigation_no_header_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -237,24 +250,27 @@ $result_trees{'navigation_no_header_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'First chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'First chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -381,23 +397,28 @@ $result_trees{'navigation_no_header_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -413,24 +434,27 @@ $result_trees{'navigation_no_header_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section in chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section in chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -743,23 +767,28 @@ $result_trees{'navigation_no_header_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'subsection'
@@ -775,24 +804,27 @@ $result_trees{'navigation_no_header_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sub section in section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sub section in section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -845,9 +877,9 @@ $result_trees{'navigation_no_header_vertical'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_no_header_vertical'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_no_header_vertical'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_no_header_vertical'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_no_header_vertical'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_no_header_vertical'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_no_header_vertical'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_no_header_vertical'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_node.pl 
b/tp/t/results/layout/navigation_node.pl
index f6e0d9d82e..7ebd6ee0d9 100644
--- a/tp/t/results/layout/navigation_node.pl
+++ b/tp/t/results/layout/navigation_node.pl
@@ -31,23 +31,28 @@ $result_trees{'navigation_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'navigation_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'File used for navigation testing'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'File used for navigation testing'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -205,23 +213,28 @@ $result_trees{'navigation_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -237,24 +250,27 @@ $result_trees{'navigation_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'First chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'First chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -381,23 +397,28 @@ $result_trees{'navigation_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -413,24 +434,27 @@ $result_trees{'navigation_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section in chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section in chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -743,23 +767,28 @@ $result_trees{'navigation_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'subsection'
@@ -775,24 +804,27 @@ $result_trees{'navigation_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sub section in section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sub section in section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -845,9 +877,9 @@ $result_trees{'navigation_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_node'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_node'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_node'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_node'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_node'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_node'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_node'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_node'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_node'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_node'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_node'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_node_no_header.pl 
b/tp/t/results/layout/navigation_node_no_header.pl
index 693ff5ea8a..eb977c88eb 100644
--- a/tp/t/results/layout/navigation_node_no_header.pl
+++ b/tp/t/results/layout/navigation_node_no_header.pl
@@ -31,23 +31,28 @@ $result_trees{'navigation_node_no_header'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'navigation_node_no_header'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'File used for navigation testing'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'File used for navigation testing'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -205,23 +213,28 @@ $result_trees{'navigation_node_no_header'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -237,24 +250,27 @@ $result_trees{'navigation_node_no_header'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'First chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'First chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -381,23 +397,28 @@ $result_trees{'navigation_node_no_header'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -413,24 +434,27 @@ $result_trees{'navigation_node_no_header'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section in chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section in chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -743,23 +767,28 @@ $result_trees{'navigation_node_no_header'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'subsection'
@@ -775,24 +804,27 @@ $result_trees{'navigation_node_no_header'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sub section in section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sub section in section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -845,9 +877,9 @@ $result_trees{'navigation_node_no_header'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_node_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_node_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_node_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_node_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_node_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_node_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_node_no_header'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_node_no_header'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_node_no_header'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_node_no_header'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_node_no_header'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_node_no_header'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_node_no_header'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_node_no_header_vertical.pl 
b/tp/t/results/layout/navigation_node_no_header_vertical.pl
index f06f7c60f7..a45955638d 100644
--- a/tp/t/results/layout/navigation_node_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_node_no_header_vertical.pl
@@ -31,23 +31,28 @@ $result_trees{'navigation_node_no_header_vertical'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'navigation_node_no_header_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'File used for navigation testing'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'File used for navigation testing'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -205,23 +213,28 @@ $result_trees{'navigation_node_no_header_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -237,24 +250,27 @@ $result_trees{'navigation_node_no_header_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'First chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'First chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -381,23 +397,28 @@ $result_trees{'navigation_node_no_header_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -413,24 +434,27 @@ $result_trees{'navigation_node_no_header_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section in chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section in chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -743,23 +767,28 @@ $result_trees{'navigation_node_no_header_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'subsection'
@@ -775,24 +804,27 @@ $result_trees{'navigation_node_no_header_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sub section in section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sub section in section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -845,9 +877,9 @@ $result_trees{'navigation_node_no_header_vertical'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_node_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_node_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_node_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_node_no_header_vertical'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_node_no_header_vertical'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_node_no_header_vertical'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_node_no_header_vertical'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_node_vertical.pl 
b/tp/t/results/layout/navigation_node_vertical.pl
index dc6bb96d27..67068102a9 100644
--- a/tp/t/results/layout/navigation_node_vertical.pl
+++ b/tp/t/results/layout/navigation_node_vertical.pl
@@ -31,23 +31,28 @@ $result_trees{'navigation_node_vertical'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'navigation_node_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'File used for navigation testing'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'File used for navigation testing'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -205,23 +213,28 @@ $result_trees{'navigation_node_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -237,24 +250,27 @@ $result_trees{'navigation_node_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'First chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'First chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -381,23 +397,28 @@ $result_trees{'navigation_node_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -413,24 +434,27 @@ $result_trees{'navigation_node_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section in chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section in chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -743,23 +767,28 @@ $result_trees{'navigation_node_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'subsection'
@@ -775,24 +804,27 @@ $result_trees{'navigation_node_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sub section in section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sub section in section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -845,9 +877,9 @@ $result_trees{'navigation_node_vertical'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_node_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_node_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_node_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_node_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_node_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_node_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_node_vertical'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_node_vertical'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_node_vertical'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_node_vertical'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_node_vertical'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_node_vertical'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_node_vertical'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_section.pl 
b/tp/t/results/layout/navigation_section.pl
index efa865d898..c408ed1d1e 100644
--- a/tp/t/results/layout/navigation_section.pl
+++ b/tp/t/results/layout/navigation_section.pl
@@ -31,23 +31,28 @@ $result_trees{'navigation_section'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'navigation_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'File used for navigation testing'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'File used for navigation testing'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -205,23 +213,28 @@ $result_trees{'navigation_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -237,24 +250,27 @@ $result_trees{'navigation_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'First chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'First chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -381,23 +397,28 @@ $result_trees{'navigation_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -413,24 +434,27 @@ $result_trees{'navigation_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section in chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section in chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -743,23 +767,28 @@ $result_trees{'navigation_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'subsection'
@@ -775,24 +804,27 @@ $result_trees{'navigation_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sub section in section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sub section in section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -845,9 +877,9 @@ $result_trees{'navigation_section'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_section'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_section'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_section'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_section'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_section'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_section'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_section'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_section'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_section'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_section'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_section'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_section'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_section'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_section_no_header.pl 
b/tp/t/results/layout/navigation_section_no_header.pl
index f54fd2be60..7767fda217 100644
--- a/tp/t/results/layout/navigation_section_no_header.pl
+++ b/tp/t/results/layout/navigation_section_no_header.pl
@@ -31,23 +31,28 @@ $result_trees{'navigation_section_no_header'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'navigation_section_no_header'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'File used for navigation testing'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'File used for navigation testing'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -205,23 +213,28 @@ $result_trees{'navigation_section_no_header'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -237,24 +250,27 @@ $result_trees{'navigation_section_no_header'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'First chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'First chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -381,23 +397,28 @@ $result_trees{'navigation_section_no_header'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -413,24 +434,27 @@ $result_trees{'navigation_section_no_header'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section in chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section in chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -743,23 +767,28 @@ $result_trees{'navigation_section_no_header'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'subsection'
@@ -775,24 +804,27 @@ $result_trees{'navigation_section_no_header'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sub section in section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sub section in section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -845,9 +877,9 @@ $result_trees{'navigation_section_no_header'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_section_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_section_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_section_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_section_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_section_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_section_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_section_no_header'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_section_no_header'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_section_no_header'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_section_no_header'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_section_no_header'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_section_no_header'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_section_no_header'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_section_no_header_vertical.pl 
b/tp/t/results/layout/navigation_section_no_header_vertical.pl
index cf4ca4eb66..60b483db48 100644
--- a/tp/t/results/layout/navigation_section_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_section_no_header_vertical.pl
@@ -31,23 +31,28 @@ $result_trees{'navigation_section_no_header_vertical'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'navigation_section_no_header_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'File used for navigation testing'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'File used for navigation testing'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -205,23 +213,28 @@ $result_trees{'navigation_section_no_header_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -237,24 +250,27 @@ $result_trees{'navigation_section_no_header_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'First chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'First chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -381,23 +397,28 @@ $result_trees{'navigation_section_no_header_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -413,24 +434,27 @@ $result_trees{'navigation_section_no_header_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section in chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section in chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -743,23 +767,28 @@ $result_trees{'navigation_section_no_header_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'subsection'
@@ -775,24 +804,27 @@ $result_trees{'navigation_section_no_header_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sub section in section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sub section in section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -845,9 +877,9 @@ $result_trees{'navigation_section_no_header_vertical'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_section_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_section_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_section_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_section_no_header_vertical'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_section_no_header_vertical'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_section_no_header_vertical'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_section_no_header_vertical'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_section_vertical.pl 
b/tp/t/results/layout/navigation_section_vertical.pl
index 316698067d..efdd8fd9b5 100644
--- a/tp/t/results/layout/navigation_section_vertical.pl
+++ b/tp/t/results/layout/navigation_section_vertical.pl
@@ -31,23 +31,28 @@ $result_trees{'navigation_section_vertical'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'navigation_section_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'File used for navigation testing'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'File used for navigation testing'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -205,23 +213,28 @@ $result_trees{'navigation_section_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -237,24 +250,27 @@ $result_trees{'navigation_section_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'First chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'First chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -381,23 +397,28 @@ $result_trees{'navigation_section_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -413,24 +434,27 @@ $result_trees{'navigation_section_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section in chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section in chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -743,23 +767,28 @@ $result_trees{'navigation_section_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'subsection'
@@ -775,24 +804,27 @@ $result_trees{'navigation_section_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sub section in section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sub section in section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -845,9 +877,9 @@ $result_trees{'navigation_section_vertical'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_section_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_section_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_section_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_section_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_section_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_section_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_section_vertical'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_section_vertical'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_section_vertical'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_section_vertical'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_section_vertical'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_section_vertical'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_section_vertical'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_test_misc_file_collision.pl 
b/tp/t/results/layout/navigation_test_misc_file_collision.pl
index ac0c670b01..75dc674ec1 100644
--- a/tp/t/results/layout/navigation_test_misc_file_collision.pl
+++ b/tp/t/results/layout/navigation_test_misc_file_collision.pl
@@ -31,23 +31,28 @@ $result_trees{'navigation_test_misc_file_collision'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'navigation_test_misc_file_collision'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'File used for navigation testing'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'File used for navigation testing'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -205,23 +213,28 @@ $result_trees{'navigation_test_misc_file_collision'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -237,24 +250,27 @@ $result_trees{'navigation_test_misc_file_collision'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'First chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'First chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -381,23 +397,28 @@ $result_trees{'navigation_test_misc_file_collision'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -413,24 +434,27 @@ $result_trees{'navigation_test_misc_file_collision'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section in chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section in chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -743,23 +767,28 @@ $result_trees{'navigation_test_misc_file_collision'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'subsection'
@@ -775,24 +804,27 @@ $result_trees{'navigation_test_misc_file_collision'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sub section in section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sub section in section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -845,9 +877,9 @@ $result_trees{'navigation_test_misc_file_collision'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_test_misc_file_collision'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_test_misc_file_collision'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_test_misc_file_collision'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_test_misc_file_collision'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_test_misc_file_collision'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_test_misc_file_collision'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_test_misc_file_collision'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_test_undef_top_buttons.pl 
b/tp/t/results/layout/navigation_test_undef_top_buttons.pl
index 14bcb47700..bd37383338 100644
--- a/tp/t/results/layout/navigation_test_undef_top_buttons.pl
+++ b/tp/t/results/layout/navigation_test_undef_top_buttons.pl
@@ -31,23 +31,28 @@ $result_trees{'navigation_test_undef_top_buttons'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'navigation_test_undef_top_buttons'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'File used for navigation testing'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'File used for navigation testing'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -205,23 +213,28 @@ $result_trees{'navigation_test_undef_top_buttons'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -237,24 +250,27 @@ $result_trees{'navigation_test_undef_top_buttons'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'First chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'First chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -381,23 +397,28 @@ $result_trees{'navigation_test_undef_top_buttons'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -413,24 +434,27 @@ $result_trees{'navigation_test_undef_top_buttons'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section in chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section in chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -743,23 +767,28 @@ $result_trees{'navigation_test_undef_top_buttons'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'subsection'
@@ -775,24 +804,27 @@ $result_trees{'navigation_test_undef_top_buttons'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sub section in section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sub section in section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -845,9 +877,9 @@ $result_trees{'navigation_test_undef_top_buttons'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_test_undef_top_buttons'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_test_undef_top_buttons'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_test_undef_top_buttons'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_test_undef_top_buttons'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_test_undef_top_buttons'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_test_undef_top_buttons'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_test_undef_top_buttons'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_test_undef_top_buttons'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_test_undef_top_buttons'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_test_undef_top_buttons'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_test_undef_top_buttons'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_test_undef_top_buttons'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_test_undef_top_buttons'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_test_zero_top_buttons.pl 
b/tp/t/results/layout/navigation_test_zero_top_buttons.pl
index fa649b2384..fb5b39a7c8 100644
--- a/tp/t/results/layout/navigation_test_zero_top_buttons.pl
+++ b/tp/t/results/layout/navigation_test_zero_top_buttons.pl
@@ -31,23 +31,28 @@ $result_trees{'navigation_test_zero_top_buttons'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'navigation_test_zero_top_buttons'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'File used for navigation testing'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'File used for navigation testing'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -205,23 +213,28 @@ $result_trees{'navigation_test_zero_top_buttons'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -237,24 +250,27 @@ $result_trees{'navigation_test_zero_top_buttons'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'First chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'First chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -381,23 +397,28 @@ $result_trees{'navigation_test_zero_top_buttons'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -413,24 +434,27 @@ $result_trees{'navigation_test_zero_top_buttons'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section in chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section in chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -743,23 +767,28 @@ $result_trees{'navigation_test_zero_top_buttons'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'subsection'
@@ -775,24 +804,27 @@ $result_trees{'navigation_test_zero_top_buttons'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sub section in section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sub section in section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -845,9 +877,9 @@ $result_trees{'navigation_test_zero_top_buttons'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_test_zero_top_buttons'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_test_zero_top_buttons'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_test_zero_top_buttons'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_test_zero_top_buttons'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_test_zero_top_buttons'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_test_zero_top_buttons'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_test_zero_top_buttons'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_test_zero_top_buttons'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_test_zero_top_buttons'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_test_zero_top_buttons'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_test_zero_top_buttons'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_test_zero_top_buttons'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_test_zero_top_buttons'} = '\\input texinfo @c 
-*-texinfo-*-
 
diff --git a/tp/t/results/layout/navigation_vertical.pl 
b/tp/t/results/layout/navigation_vertical.pl
index 55d5b78f4a..33ed47b0ed 100644
--- a/tp/t/results/layout/navigation_vertical.pl
+++ b/tp/t/results/layout/navigation_vertical.pl
@@ -31,23 +31,28 @@ $result_trees{'navigation_vertical'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'navigation_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'File used for navigation testing'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'File used for navigation testing'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -205,23 +213,28 @@ $result_trees{'navigation_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -237,24 +250,27 @@ $result_trees{'navigation_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'First chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'First chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -381,23 +397,28 @@ $result_trees{'navigation_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -413,24 +434,27 @@ $result_trees{'navigation_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section in chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section in chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -743,23 +767,28 @@ $result_trees{'navigation_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'subsection'
@@ -775,24 +804,27 @@ $result_trees{'navigation_vertical'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sub section in section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sub section in section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -845,9 +877,9 @@ $result_trees{'navigation_vertical'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'navigation_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'navigation_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_vertical'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_vertical'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_vertical'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_vertical'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'navigation_vertical'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'navigation_vertical'}{'contents'}[6]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'navigation_vertical'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/layout/no_monolithic.pl 
b/tp/t/results/layout/no_monolithic.pl
index 0ce51d89e2..adcf0b9ae2 100644
--- a/tp/t/results/layout/no_monolithic.pl
+++ b/tp/t/results/layout/no_monolithic.pl
@@ -31,23 +31,28 @@ $result_trees{'no_monolithic'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'no_monolithic'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Not monolithic'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Not monolithic'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -287,23 +295,28 @@ $result_trees{'no_monolithic'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -320,24 +333,27 @@ $result_trees{'no_monolithic'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -452,8 +468,8 @@ $result_trees{'no_monolithic'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'no_monolithic'}{'contents'}[1];
-$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'no_monolithic'}{'contents'}[1];
+$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'no_monolithic'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/layout/no_monolithic_only_toc_out.pl 
b/tp/t/results/layout/no_monolithic_only_toc_out.pl
index 739530a2c1..d91829e271 100644
--- a/tp/t/results/layout/no_monolithic_only_toc_out.pl
+++ b/tp/t/results/layout/no_monolithic_only_toc_out.pl
@@ -31,23 +31,28 @@ $result_trees{'no_monolithic_only_toc_out'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'no_monolithic_only_toc_out'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Not monolithic'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Not monolithic'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -287,23 +295,28 @@ $result_trees{'no_monolithic_only_toc_out'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -320,24 +333,27 @@ $result_trees{'no_monolithic_only_toc_out'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -452,8 +468,8 @@ $result_trees{'no_monolithic_only_toc_out'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'no_monolithic_only_toc_out'}{'contents'}[1];
+$result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'no_monolithic_only_toc_out'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/linemacro/simple_nested_linemacro_calls.pl 
b/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
index f6af4ed08b..ed5127b31b 100644
--- a/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
+++ b/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
@@ -11,24 +11,27 @@ $result_trees{'simple_nested_linemacro_calls'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -606,7 +609,7 @@ $result_trees{'simple_nested_linemacro_calls'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'simple_nested_linemacro_calls'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'simple_nested_linemacro_calls'}{'contents'}[1];
+$result_trees{'simple_nested_linemacro_calls'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'simple_nested_linemacro_calls'}{'contents'}[1];
 
 $result_texis{'simple_nested_linemacro_calls'} = '@node Top
 
diff --git a/tp/t/results/macro/backslash_in_arg.pl 
b/tp/t/results/macro/backslash_in_arg.pl
index a2771fbe09..30c86c9b77 100644
--- a/tp/t/results/macro/backslash_in_arg.pl
+++ b/tp/t/results/macro/backslash_in_arg.pl
@@ -11,23 +11,28 @@ $result_trees{'backslash_in_arg'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'backslash_in_arg'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -459,10 +467,10 @@ $result_trees{'backslash_in_arg'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[4]{'extra'}{'element_node'}
 = $result_trees{'backslash_in_arg'}{'contents'}[2];
 
$result_trees{'backslash_in_arg'}{'contents'}[2]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'backslash_in_arg'}{'contents'}[2];
 
$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'}[7]{'extra'}{'element_node'}
 = $result_trees{'backslash_in_arg'}{'contents'}[2];
 
 $result_texis{'backslash_in_arg'} = '@node Top
 @node chap
diff --git a/tp/t/results/macro/bib_example.pl 
b/tp/t/results/macro/bib_example.pl
index 7622273d42..b889511abb 100644
--- a/tp/t/results/macro/bib_example.pl
+++ b/tp/t/results/macro/bib_example.pl
@@ -2664,23 +2664,28 @@ $result_trees{'bib_example'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -2696,24 +2701,27 @@ $result_trees{'bib_example'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2949,23 +2957,28 @@ $result_trees{'bib_example'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Introduction'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Introduction'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Introduction'
@@ -2981,24 +2994,27 @@ $result_trees{'bib_example'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Introduction'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Introduction'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3378,37 +3394,42 @@ $result_trees{'bib_example'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'source_marks' => [
-                {
-                  'counter' => 3,
-                  'position' => 10,
-                  'sourcemark_type' => 'value_expansion',
-                  'status' => 'end'
-                },
+              'contents' => [
                 {
-                  'counter' => 7,
-                  'position' => 10,
-                  'sourcemark_type' => 'macro_expansion',
-                  'status' => 'end'
+                  'source_marks' => [
+                    {
+                      'counter' => 3,
+                      'position' => 10,
+                      'sourcemark_type' => 'value_expansion',
+                      'status' => 'end'
+                    },
+                    {
+                      'counter' => 7,
+                      'position' => 10,
+                      'sourcemark_type' => 'macro_expansion',
+                      'status' => 'end'
+                    }
+                  ],
+                  'text' => 'References'
                 }
               ],
-              'text' => 'References'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'References'
@@ -3463,24 +3484,27 @@ $result_trees{'bib_example'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'References'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'References'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3962,10 +3986,10 @@ $result_trees{'bib_example'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'bib_example'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'bib_example'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0];
-$result_trees{'bib_example'}{'contents'}[6]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'bib_example'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'bib_example'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'bib_example'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'bib_example'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'bib_example'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'bib_example'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'bib_example'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0];
+$result_trees{'bib_example'}{'contents'}[6]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'bib_example'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'bib_example'} = '\\input texinfo   @c -*-texinfo-*-
 @c % Copyright (C) 2004  Aaron S. Hawley
diff --git a/tp/t/results/macro/glossary.pl b/tp/t/results/macro/glossary.pl
index 9cfa434b8c..11d30bf75d 100644
--- a/tp/t/results/macro/glossary.pl
+++ b/tp/t/results/macro/glossary.pl
@@ -365,23 +365,28 @@ $result_trees{'glossary'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -397,24 +402,27 @@ $result_trees{'glossary'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1460,23 +1468,28 @@ $result_trees{'glossary'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'glossary'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'glossary'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'glossary'
@@ -1492,24 +1505,27 @@ $result_trees{'glossary'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'glossary'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'glossary'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'source_marks' => [
             {
@@ -1629,9 +1645,9 @@ $result_trees{'glossary'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'glossary'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'glossary'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[8]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[8]{'contents'}[0]{'contents'}[0];
+$result_trees{'glossary'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'glossary'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'glossary'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'glossary'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'glossary'}{'contents'}[2]{'contents'}[4]{'contents'}[8]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'glossary'}{'contents'}[2]{'contents'}[4]{'contents'}[8]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'glossary'} = '\\input texinfo.tex
 
diff --git a/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl 
b/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl
index c4adab4e75..3fa05ab918 100644
--- a/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl
+++ b/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl
@@ -11,23 +11,28 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -77,23 +85,28 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -109,24 +122,27 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1231,9 +1247,9 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'macro_alias_definfoenclose_defindex'}{'contents'}[4]{'contents'}[11]{'extra'}{'element_node'}
 = $result_trees{'macro_alias_definfoenclose_defindex'}{'contents'}[3];
-$result_trees{'macro_alias_definfoenclose_defindex'}{'contents'}[4]{'contents'}[20]{'extra'}{'element_node'}
 = $result_trees{'macro_alias_definfoenclose_defindex'}{'contents'}[3];
-$result_trees{'macro_alias_definfoenclose_defindex'}{'contents'}[4]{'contents'}[32]{'extra'}{'element_node'}
 = $result_trees{'macro_alias_definfoenclose_defindex'}{'contents'}[3];
+$result_trees{'macro_alias_definfoenclose_defindex'}{'contents'}[4]{'contents'}[12]{'extra'}{'element_node'}
 = $result_trees{'macro_alias_definfoenclose_defindex'}{'contents'}[3];
+$result_trees{'macro_alias_definfoenclose_defindex'}{'contents'}[4]{'contents'}[21]{'extra'}{'element_node'}
 = $result_trees{'macro_alias_definfoenclose_defindex'}{'contents'}[3];
+$result_trees{'macro_alias_definfoenclose_defindex'}{'contents'}[4]{'contents'}[33]{'extra'}{'element_node'}
 = $result_trees{'macro_alias_definfoenclose_defindex'}{'contents'}[3];
 
 $result_texis{'macro_alias_definfoenclose_defindex'} = '@node Top
 @top top
diff --git a/tp/t/results/macro/macro_in_index_commands.pl 
b/tp/t/results/macro/macro_in_index_commands.pl
index f5dc765885..74f8aeb55d 100644
--- a/tp/t/results/macro/macro_in_index_commands.pl
+++ b/tp/t/results/macro/macro_in_index_commands.pl
@@ -718,23 +718,28 @@ $result_trees{'macro_in_index_commands'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -749,24 +754,27 @@ $result_trees{'macro_in_index_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'source_marks' => [
             {
@@ -1271,10 +1279,10 @@ $result_trees{'macro_in_index_commands'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[3]{'extra'}{'element_node'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[2];
-$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[2];
+$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[2];
+$result_trees{'macro_in_index_commands'}{'contents'}[2]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[2];
 
$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'}[7]{'extra'}{'element_node'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[2];
 
 $result_texis{'macro_in_index_commands'} = '@macro cp
 cp
diff --git a/tp/t/results/macro/macro_in_misc_commands.pl 
b/tp/t/results/macro/macro_in_misc_commands.pl
index 1ffa2e006f..07cc9f8837 100644
--- a/tp/t/results/macro/macro_in_misc_commands.pl
+++ b/tp/t/results/macro/macro_in_misc_commands.pl
@@ -135,31 +135,36 @@ $result_trees{'macro_in_misc_commands'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'source_marks' => [
+              'contents' => [
                 {
-                  'counter' => 1,
-                  'position' => 3,
-                  'sourcemark_type' => 'macro_expansion',
-                  'status' => 'end'
+                  'source_marks' => [
+                    {
+                      'counter' => 1,
+                      'position' => 3,
+                      'sourcemark_type' => 'macro_expansion',
+                      'status' => 'end'
+                    }
+                  ],
+                  'text' => 'Top'
                 }
               ],
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -193,49 +198,52 @@ $result_trees{'macro_in_misc_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'source_marks' => [
+              'contents' => [
                 {
-                  'counter' => 2,
-                  'element' => {
-                    'contents' => [
-                      {
-                        'type' => 'brace_arg'
-                      }
-                    ],
-                    'info' => {
-                      'command_name' => 'text'
+                  'source_marks' => [
+                    {
+                      'counter' => 2,
+                      'element' => {
+                        'contents' => [
+                          {
+                            'type' => 'brace_arg'
+                          }
+                        ],
+                        'info' => {
+                          'command_name' => 'text'
+                        },
+                        'type' => 'macro_call'
+                      },
+                      'position' => 4,
+                      'sourcemark_type' => 'macro_expansion',
+                      'status' => 'start'
                     },
-                    'type' => 'macro_call'
-                  },
-                  'position' => 4,
-                  'sourcemark_type' => 'macro_expansion',
-                  'status' => 'start'
-                },
-                {
-                  'counter' => 2,
-                  'position' => 9,
-                  'sourcemark_type' => 'macro_expansion',
-                  'status' => 'end'
+                    {
+                      'counter' => 2,
+                      'position' => 9,
+                      'sourcemark_type' => 'macro_expansion',
+                      'status' => 'end'
+                    }
+                  ],
+                  'text' => 'top atext'
                 }
               ],
-              'text' => 'top atext'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -4856,48 +4864,53 @@ $result_trees{'macro_in_misc_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'source_marks' => [
+              'contents' => [
                 {
-                  'counter' => 48,
-                  'element' => {
-                    'contents' => [
-                      {
-                        'type' => 'brace_arg'
-                      }
-                    ],
-                    'info' => {
-                      'command_name' => 'text'
+                  'source_marks' => [
+                    {
+                      'counter' => 48,
+                      'element' => {
+                        'contents' => [
+                          {
+                            'type' => 'brace_arg'
+                          }
+                        ],
+                        'info' => {
+                          'command_name' => 'text'
+                        },
+                        'type' => 'macro_call'
+                      },
+                      'position' => 5,
+                      'sourcemark_type' => 'macro_expansion',
+                      'status' => 'start'
                     },
-                    'type' => 'macro_call'
-                  },
-                  'position' => 5,
-                  'sourcemark_type' => 'macro_expansion',
-                  'status' => 'start'
-                },
-                {
-                  'counter' => 48,
-                  'position' => 10,
-                  'sourcemark_type' => 'macro_expansion',
-                  'status' => 'end'
+                    {
+                      'counter' => 48,
+                      'position' => 10,
+                      'sourcemark_type' => 'macro_expansion',
+                      'status' => 'end'
+                    }
+                  ],
+                  'text' => 'node atext'
                 }
               ],
-              'text' => 'node atext'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-atext'
@@ -4912,24 +4925,27 @@ $result_trees{'macro_in_misc_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'source_marks' => [
             {
@@ -5192,7 +5208,7 @@ $result_trees{'macro_in_misc_commands'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[124]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[124]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[125]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[125]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'macro_in_misc_commands'} = '@macro text 
 atext
diff --git 
a/tp/t/results/menu/appendix_and_associated_part_in_generated_menu.pl 
b/tp/t/results/menu/appendix_and_associated_part_in_generated_menu.pl
index 5f3db903b6..73dcecfc0b 100644
--- a/tp/t/results/menu/appendix_and_associated_part_in_generated_menu.pl
+++ b/tp/t/results/menu/appendix_and_associated_part_in_generated_menu.pl
@@ -11,23 +11,28 @@ 
$result_trees{'appendix_and_associated_part_in_generated_menu'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ 
$result_trees{'appendix_and_associated_part_in_generated_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -77,23 +85,28 @@ 
$result_trees{'appendix_and_associated_part_in_generated_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -108,24 +121,27 @@ 
$result_trees{'appendix_and_associated_part_in_generated_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -145,23 +161,28 @@ 
$result_trees{'appendix_and_associated_part_in_generated_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sec'
@@ -176,24 +197,27 @@ 
$result_trees{'appendix_and_associated_part_in_generated_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendixsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendixsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -213,24 +237,27 @@ 
$result_trees{'appendix_and_associated_part_in_generated_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'P1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'P1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -248,23 +275,28 @@ 
$result_trees{'appendix_and_associated_part_in_generated_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap2'
@@ -279,24 +311,27 @@ 
$result_trees{'appendix_and_associated_part_in_generated_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -317,24 +352,27 @@ 
$result_trees{'appendix_and_associated_part_in_generated_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Final'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Final'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -352,23 +390,28 @@ 
$result_trees{'appendix_and_associated_part_in_generated_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'app'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'app'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'app'
@@ -383,23 +426,28 @@ 
$result_trees{'appendix_and_associated_part_in_generated_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'GGG'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'GGG'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'appendix',
       'extra' => {
         'associated_part' => {},
         'section_number' => 'A'
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 45530f61dd..21799f6c2c 100644
--- a/tp/t/results/menu/block_commands_in_menu_description.pl
+++ b/tp/t/results/menu/block_commands_in_menu_description.pl
@@ -11,23 +11,28 @@ $result_trees{'block_commands_in_menu_description'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'first'
@@ -42,24 +47,27 @@ $result_trees{'block_commands_in_menu_description'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -566,9 +574,9 @@ $result_trees{'block_commands_in_menu_description'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'block_commands_in_menu_description'} = '@node first
 @top top
diff --git a/tp/t/results/menu/commands_in_nodedescriptionblock.pl 
b/tp/t/results/menu/commands_in_nodedescriptionblock.pl
index 963b88e800..30193c896f 100644
--- a/tp/t/results/menu/commands_in_nodedescriptionblock.pl
+++ b/tp/t/results/menu/commands_in_nodedescriptionblock.pl
@@ -11,23 +11,28 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'test commands in nodedescriptionblock'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'test commands in nodedescriptionblock'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -291,23 +299,28 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'node_description' => {
@@ -598,24 +611,27 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
               'extra' => {
                 'caption' => {},
                 'float_section' => {
-                  'args' => [
+                  'cmdname' => 'chapter',
+                  'contents' => [
                     {
                       'contents' => [
                         {
-                          'text' => 'chap1'
-                        }
-                      ],
-                      'info' => {
-                        'spaces_after_argument' => {
-                          'text' => '
+                          'contents' => [
+                            {
+                              'text' => 'chap1'
+                            }
+                          ],
+                          'info' => {
+                            'spaces_after_argument' => {
+                              'text' => '
 '
+                            }
+                          },
+                          'type' => 'line_arg'
                         }
-                      },
-                      'type' => 'line_arg'
-                    }
-                  ],
-                  'cmdname' => 'chapter',
-                  'contents' => [
+                      ],
+                      'type' => 'argument'
+                    },
                     {
                       'text' => '
 ',
@@ -715,23 +731,28 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
     },
     {},
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -747,24 +768,27 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1036,21 +1060,21 @@ $result_trees{'commands_in_nodedescriptionblock'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[3]{'extra'}{'node_description'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[3]{'extra'}{'node_description'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[3]{'extra'}{'node_description'}{'contents'}[4]{'contents'}[7]{'extra'}{'element_node'}
 = $result_trees{'commands_in_nodedescriptionblock'}{'contents'}[3];
 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[3]{'extra'}{'node_description'}{'contents'}[6]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[3]{'extra'}{'node_description'}{'contents'}[6];
 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[3]{'extra'}{'node_description'}{'contents'}[6]{'extra'}{'caption'}
 = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[3]{'extra'}{'node_description'}{'contents'}[6]{'contents'}[3];
-$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[3]{'extra'}{'node_description'}{'contents'}[6]{'extra'}{'float_section'}{'contents'}[1]
 = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[3]{'extra'}{'node_description'};
+$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[3]{'extra'}{'node_description'}{'contents'}[6]{'extra'}{'float_section'}{'contents'}[2]
 = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[3]{'extra'}{'node_description'};
 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[3]{'extra'}{'node_description'}{'extra'}{'element_node'}
 = $result_trees{'commands_in_nodedescriptionblock'}{'contents'}[3];
 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[3]{'extra'}{'node_long_description'}
 = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[3]{'extra'}{'node_description'};
 $result_trees{'commands_in_nodedescriptionblock'}{'contents'}[4] = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[3]{'extra'}{'node_description'}{'contents'}[6]{'extra'}{'float_section'};
-$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[6]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[6]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[6]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[6]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[6]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'commands_in_nodedescriptionblock'}{'contents'}[6]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'commands_in_nodedescriptionblock'} = '@node Top
 @top test commands in nodedescriptionblock
diff --git a/tp/t/results/menu/comment_on_menu_line.pl 
b/tp/t/results/menu/comment_on_menu_line.pl
index b4b4821660..c528d1feb6 100644
--- a/tp/t/results/menu/comment_on_menu_line.pl
+++ b/tp/t/results/menu/comment_on_menu_line.pl
@@ -11,24 +11,27 @@ $result_trees{'comment_on_menu_line'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -163,23 +166,28 @@ $result_trees{'comment_on_menu_line'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
@@ -193,23 +201,28 @@ $result_trees{'comment_on_menu_line'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'first'
@@ -226,7 +239,7 @@ $result_trees{'comment_on_menu_line'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'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 38d4e80265..fcac2919c4 100644
--- a/tp/t/results/menu/detailmenu_on_subnodes.pl
+++ b/tp/t/results/menu/detailmenu_on_subnodes.pl
@@ -11,23 +11,28 @@ $result_trees{'detailmenu_on_subnodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'detailmenu_on_subnodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -519,23 +527,28 @@ $result_trees{'detailmenu_on_subnodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -550,24 +563,27 @@ $result_trees{'detailmenu_on_subnodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -690,23 +706,28 @@ $result_trees{'detailmenu_on_subnodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -721,24 +742,27 @@ $result_trees{'detailmenu_on_subnodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -758,23 +782,28 @@ $result_trees{'detailmenu_on_subnodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-2'
@@ -789,24 +818,27 @@ $result_trees{'detailmenu_on_subnodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -975,23 +1007,28 @@ $result_trees{'detailmenu_on_subnodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section chap 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section chap 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section-chap-2'
@@ -1006,24 +1043,27 @@ $result_trees{'detailmenu_on_subnodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section chap 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section chap 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1043,23 +1083,28 @@ $result_trees{'detailmenu_on_subnodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumberedsec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumberedsec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumberedsec'
@@ -1074,23 +1119,28 @@ $result_trees{'detailmenu_on_subnodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumberedsec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumberedsec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'unnumberedsec',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
@@ -1104,14 +1154,14 @@ $result_trees{'detailmenu_on_subnodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[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'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'detailmenu_on_subnodes'} = '@node Top
 @top top
diff --git a/tp/t/results/menu/detailmenu_unknown_node.pl 
b/tp/t/results/menu/detailmenu_unknown_node.pl
index 0351945d6a..f76b0c680f 100644
--- a/tp/t/results/menu/detailmenu_unknown_node.pl
+++ b/tp/t/results/menu/detailmenu_unknown_node.pl
@@ -11,24 +11,27 @@ $result_trees{'detailmenu_unknown_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -202,7 +205,7 @@ $result_trees{'detailmenu_unknown_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'detailmenu_unknown_node'} = '@node Top
 
diff --git a/tp/t/results/menu/direntry_dircategory_after_first_node.pl 
b/tp/t/results/menu/direntry_dircategory_after_first_node.pl
index db8d0d3190..f074cff628 100644
--- a/tp/t/results/menu/direntry_dircategory_after_first_node.pl
+++ b/tp/t/results/menu/direntry_dircategory_after_first_node.pl
@@ -11,23 +11,28 @@ $result_trees{'direntry_dircategory_after_first_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'direntry_dircategory_after_first_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'direntry direcategory after first node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'direntry direcategory after first node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -221,7 +229,7 @@ $result_trees{'direntry_dircategory_after_first_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'direntry_dircategory_after_first_node'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'direntry_dircategory_after_first_node'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1];
+$result_trees{'direntry_dircategory_after_first_node'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'direntry_dircategory_after_first_node'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
 $result_texis{'direntry_dircategory_after_first_node'} = '@node Top
 @top direntry direcategory after first node
diff --git a/tp/t/results/menu/empty_leading_menu_comment.pl 
b/tp/t/results/menu/empty_leading_menu_comment.pl
index f390af3460..3985ced429 100644
--- a/tp/t/results/menu/empty_leading_menu_comment.pl
+++ b/tp/t/results/menu/empty_leading_menu_comment.pl
@@ -11,24 +11,27 @@ $result_trees{'empty_leading_menu_comment'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -178,8 +181,8 @@ $result_trees{'empty_leading_menu_comment'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'empty_leading_menu_comment'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'empty_leading_menu_comment'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'empty_leading_menu_comment'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'empty_leading_menu_comment'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
+$result_trees{'empty_leading_menu_comment'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'empty_leading_menu_comment'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'empty_leading_menu_comment'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'empty_leading_menu_comment'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
 $result_texis{'empty_leading_menu_comment'} = '@node first
 
diff --git a/tp/t/results/menu/empty_menu_description.pl 
b/tp/t/results/menu/empty_menu_description.pl
index b078aad34f..753a082d2d 100644
--- a/tp/t/results/menu/empty_menu_description.pl
+++ b/tp/t/results/menu/empty_menu_description.pl
@@ -11,24 +11,27 @@ $result_trees{'empty_menu_description'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -181,9 +184,9 @@ $result_trees{'empty_menu_description'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'empty_menu_description'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'empty_menu_description'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1];
-$result_trees{'empty_menu_description'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'empty_menu_description'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[3];
-$result_trees{'empty_menu_description'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'empty_menu_description'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[4];
+$result_trees{'empty_menu_description'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'empty_menu_description'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1];
+$result_trees{'empty_menu_description'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'empty_menu_description'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[3];
+$result_trees{'empty_menu_description'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'empty_menu_description'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[4];
 
 $result_texis{'empty_menu_description'} = '@node first
 
diff --git a/tp/t/results/menu/empty_menu_entry_name.pl 
b/tp/t/results/menu/empty_menu_entry_name.pl
index c06257db5b..e4d9549a9b 100644
--- a/tp/t/results/menu/empty_menu_entry_name.pl
+++ b/tp/t/results/menu/empty_menu_entry_name.pl
@@ -11,24 +11,27 @@ $result_trees{'empty_menu_entry_name'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -217,23 +220,28 @@ $result_trees{'empty_menu_entry_name'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'aaa'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'aaa'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'aaa'
@@ -250,8 +258,8 @@ $result_trees{'empty_menu_entry_name'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1];
-$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[0];
+$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1];
+$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'empty_menu_entry_name'} = '@node first
 
diff --git a/tp/t/results/menu/entry_after_detailmenu.pl 
b/tp/t/results/menu/entry_after_detailmenu.pl
index 9dfdb9b1a3..24de0c5575 100644
--- a/tp/t/results/menu/entry_after_detailmenu.pl
+++ b/tp/t/results/menu/entry_after_detailmenu.pl
@@ -11,24 +11,27 @@ $result_trees{'entry_after_detailmenu'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -435,23 +438,28 @@ $result_trees{'entry_after_detailmenu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap-first'
@@ -466,23 +474,28 @@ $result_trees{'entry_after_detailmenu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'second'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'second'
@@ -499,10 +512,10 @@ $result_trees{'entry_after_detailmenu'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[0];
+$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'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 45c4302e38..6aeaae602d 100644
--- a/tp/t/results/menu/example_in_menu_description.pl
+++ b/tp/t/results/menu/example_in_menu_description.pl
@@ -11,23 +11,28 @@ $result_trees{'example_in_menu_description'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'first'
@@ -42,24 +47,27 @@ $result_trees{'example_in_menu_description'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -267,7 +275,7 @@ $result_trees{'example_in_menu_description'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'example_in_menu_description'} = '@node first
 @top top
diff --git a/tp/t/results/menu/format_menu_undef.pl 
b/tp/t/results/menu/format_menu_undef.pl
index 80efc39912..5fb1cab1e0 100644
--- a/tp/t/results/menu/format_menu_undef.pl
+++ b/tp/t/results/menu/format_menu_undef.pl
@@ -11,23 +11,28 @@ $result_trees{'format_menu_undef'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'format_menu_undef'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -77,23 +85,28 @@ $result_trees{'format_menu_undef'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -108,23 +121,28 @@ $result_trees{'format_menu_undef'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
diff --git a/tp/t/results/menu/formats_in_menu.pl 
b/tp/t/results/menu/formats_in_menu.pl
index 061a431fbd..f1a85fbe50 100644
--- a/tp/t/results/menu/formats_in_menu.pl
+++ b/tp/t/results/menu/formats_in_menu.pl
@@ -11,24 +11,27 @@ $result_trees{'formats_in_menu'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -683,11 +686,11 @@ $result_trees{'formats_in_menu'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'formats_in_menu'} = '@node first
 
diff --git a/tp/t/results/menu/inlineraw_in_menu_description.pl 
b/tp/t/results/menu/inlineraw_in_menu_description.pl
index d366dcc968..24d15dbc95 100644
--- a/tp/t/results/menu/inlineraw_in_menu_description.pl
+++ b/tp/t/results/menu/inlineraw_in_menu_description.pl
@@ -11,23 +11,28 @@ $result_trees{'inlineraw_in_menu_description'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'first'
@@ -42,24 +47,27 @@ $result_trees{'inlineraw_in_menu_description'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -243,7 +251,7 @@ $result_trees{'inlineraw_in_menu_description'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'inlineraw_in_menu_description'} = '@node first
 @top top
diff --git a/tp/t/results/menu/invalid_info_menu_entry.pl 
b/tp/t/results/menu/invalid_info_menu_entry.pl
index 16c9d41f20..5c75acb48f 100644
--- a/tp/t/results/menu/invalid_info_menu_entry.pl
+++ b/tp/t/results/menu/invalid_info_menu_entry.pl
@@ -11,24 +11,27 @@ $result_trees{'invalid_info_menu_entry'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -516,16 +519,16 @@ $result_trees{'invalid_info_menu_entry'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1];
-$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[3];
-$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[1];
-$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[3];
-$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'contents'}[1];
-$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'contents'}[3];
-$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[3]{'contents'}[1];
-$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[3]{'contents'}[3];
+$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1];
+$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[3];
+$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[1];
+$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[3];
+$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[3]{'contents'}[1];
+$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[3]{'contents'}[3];
+$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[3]{'contents'}[1];
+$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[2]{'contents'}[5]{'contents'}[3]{'contents'}[3];
 
 $result_texis{'invalid_info_menu_entry'} = '@node first
 
diff --git a/tp/t/results/menu/leading_space_before_menu_star.pl 
b/tp/t/results/menu/leading_space_before_menu_star.pl
index 611fc1b4cc..bb238b2b41 100644
--- a/tp/t/results/menu/leading_space_before_menu_star.pl
+++ b/tp/t/results/menu/leading_space_before_menu_star.pl
@@ -11,24 +11,27 @@ $result_trees{'leading_space_before_menu_star'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'a node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'a node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/menu/menu_in_deffn.pl 
b/tp/t/results/menu/menu_in_deffn.pl
index 93c9c2c27f..e4d4fc6d40 100644
--- a/tp/t/results/menu/menu_in_deffn.pl
+++ b/tp/t/results/menu/menu_in_deffn.pl
@@ -11,24 +11,27 @@ $result_trees{'menu_in_deffn'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -290,8 +293,8 @@ $result_trees{'menu_in_deffn'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'menu_in_deffn'}{'contents'}[1];
+$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'menu_in_deffn'} = '@node first
 
diff --git a/tp/t/results/menu/menu_in_example.pl 
b/tp/t/results/menu/menu_in_example.pl
index bca37e86a1..1ab0ce6ef9 100644
--- a/tp/t/results/menu/menu_in_example.pl
+++ b/tp/t/results/menu/menu_in_example.pl
@@ -11,24 +11,27 @@ $result_trees{'menu_in_example'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -491,11 +494,11 @@ $result_trees{'menu_in_example'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1];
-$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4];
-$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'contents'}[1];
-$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'contents'}[4];
+$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1];
+$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4];
+$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'contents'}[1];
+$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'contents'}[4];
 
 $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 1d9f70686d..25524f7398 100644
--- a/tp/t/results/menu/menu_node_unterminated.pl
+++ b/tp/t/results/menu/menu_node_unterminated.pl
@@ -11,24 +11,27 @@ $result_trees{'menu_node_unterminated'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -149,8 +152,8 @@ $result_trees{'menu_node_unterminated'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[0];
-$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1];
+$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[0];
+$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
 $result_texis{'menu_node_unterminated'} = '@node first
 
diff --git a/tp/t/results/menu/menu_pointing_to_anchor.pl 
b/tp/t/results/menu/menu_pointing_to_anchor.pl
index dc9149e6a3..c153ad36e4 100644
--- a/tp/t/results/menu/menu_pointing_to_anchor.pl
+++ b/tp/t/results/menu/menu_pointing_to_anchor.pl
@@ -11,23 +11,28 @@ $result_trees{'menu_pointing_to_anchor'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'menu_pointing_to_anchor'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -221,7 +229,7 @@ $result_trees{'menu_pointing_to_anchor'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'menu_pointing_to_anchor'} = '@node Top
 @top top
diff --git a/tp/t/results/menu/menu_title_before_entries.pl 
b/tp/t/results/menu/menu_title_before_entries.pl
index a37bdbb5f6..1cf86a3726 100644
--- a/tp/t/results/menu/menu_title_before_entries.pl
+++ b/tp/t/results/menu/menu_title_before_entries.pl
@@ -11,24 +11,27 @@ $result_trees{'menu_title_before_entries'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -166,23 +169,28 @@ $result_trees{'menu_title_before_entries'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap subnode'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap subnode'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap-subnode'
@@ -199,7 +207,7 @@ $result_trees{'menu_title_before_entries'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'menu_title_before_entries'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'menu_title_before_entries'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'menu_title_before_entries'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'menu_title_before_entries'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'menu_title_before_entries'} = '@node Top
 
diff --git a/tp/t/results/menu/missing_detailmenu_on_subnodes.pl 
b/tp/t/results/menu/missing_detailmenu_on_subnodes.pl
index d324bd70f6..2e9f66261e 100644
--- a/tp/t/results/menu/missing_detailmenu_on_subnodes.pl
+++ b/tp/t/results/menu/missing_detailmenu_on_subnodes.pl
@@ -11,23 +11,28 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -403,23 +411,28 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -434,24 +447,27 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -574,23 +590,28 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -605,24 +626,27 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -642,23 +666,28 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-2'
@@ -673,24 +702,27 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -859,23 +891,28 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section chap 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section chap 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section-chap-2'
@@ -890,24 +927,27 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section chap 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section chap 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -927,23 +967,28 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumberedsec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumberedsec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumberedsec'
@@ -958,23 +1003,28 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumberedsec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumberedsec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'unnumberedsec',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
@@ -988,14 +1038,14 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[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'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[0];
-$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0];
-$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[0];
+$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0];
+$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'missing_detailmenu_on_subnodes'} = '@node Top
 @top top
diff --git a/tp/t/results/menu/multiple_menus.pl 
b/tp/t/results/menu/multiple_menus.pl
index 477ebbbbb2..fb28b4fd68 100644
--- a/tp/t/results/menu/multiple_menus.pl
+++ b/tp/t/results/menu/multiple_menus.pl
@@ -11,24 +11,27 @@ $result_trees{'multiple_menus'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -280,10 +283,10 @@ $result_trees{'multiple_menus'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[3];
 
 $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 8d6d69905d..18e9bd2f71 100644
--- a/tp/t/results/menu/no_colon_in_menu.pl
+++ b/tp/t/results/menu/no_colon_in_menu.pl
@@ -11,24 +11,27 @@ $result_trees{'no_colon_in_menu'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/menu/nodedescription_descriptions.pl 
b/tp/t/results/menu/nodedescription_descriptions.pl
index f6db5ea436..c96a0f4b1a 100644
--- a/tp/t/results/menu/nodedescription_descriptions.pl
+++ b/tp/t/results/menu/nodedescription_descriptions.pl
@@ -11,23 +11,28 @@ $result_trees{'nodedescription_descriptions'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'nodedescription_descriptions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'test of nodedescription used in menu'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'test of nodedescription used in menu'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -495,23 +503,28 @@ $result_trees{'nodedescription_descriptions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'toto'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'toto'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'node_description' => {
@@ -638,24 +651,27 @@ $result_trees{'nodedescription_descriptions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Toto'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Toto'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -681,23 +697,28 @@ $result_trees{'nodedescription_descriptions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'titi'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'titi'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'node_description' => {
@@ -742,24 +763,27 @@ $result_trees{'nodedescription_descriptions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Titi'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Titi'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -785,23 +809,28 @@ $result_trees{'nodedescription_descriptions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'other'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'other'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'node_description' => {
@@ -846,24 +875,27 @@ $result_trees{'nodedescription_descriptions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Other'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Other'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -889,23 +921,28 @@ $result_trees{'nodedescription_descriptions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'last'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'last'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'node_description' => {
@@ -950,24 +987,27 @@ $result_trees{'nodedescription_descriptions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Last'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Last'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -993,23 +1033,28 @@ $result_trees{'nodedescription_descriptions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'a somewhat long node without description nor 
following space'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'a somewhat long node without description nor 
following space'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'node_description' => {
@@ -1054,24 +1099,27 @@ $result_trees{'nodedescription_descriptions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Somewhat long'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Somewhat long'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1097,23 +1145,28 @@ $result_trees{'nodedescription_descriptions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'a very long node without description with very little 
space left for'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'a very long node without description with very 
little space left for'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'node_description' => {
@@ -1158,24 +1211,27 @@ $result_trees{'nodedescription_descriptions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Very long'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Very long'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1201,23 +1257,28 @@ $result_trees{'nodedescription_descriptions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'very very long node extending past the max columns 
and without description'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'very very long node extending past the max 
columns and without description'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'node_description' => {
@@ -1262,24 +1323,27 @@ $result_trees{'nodedescription_descriptions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Past max columns'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Past max columns'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1302,27 +1366,27 @@ $result_trees{'nodedescription_descriptions'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodedescription_descriptions'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodedescription_descriptions'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodedescription_descriptions'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodedescription_descriptions'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodedescription_descriptions'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodedescription_descriptions'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[0];
-$result_trees{'nodedescription_descriptions'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodedescription_descriptions'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[3]{'contents'}[0];
-$result_trees{'nodedescription_descriptions'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodedescription_descriptions'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodedescription_descriptions'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodedescription_descriptions'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodedescription_descriptions'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodedescription_descriptions'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodedescription_descriptions'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodedescription_descriptions'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodedescription_descriptions'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodedescription_descriptions'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodedescription_descriptions'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodedescription_descriptions'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodedescription_descriptions'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodedescription_descriptions'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodedescription_descriptions'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodedescription_descriptions'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodedescription_descriptions'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodedescription_descriptions'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodedescription_descriptions'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodedescription_descriptions'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodedescription_descriptions'}{'contents'}[3]{'extra'}{'node_description'}{'extra'}{'element_node'}
 = $result_trees{'nodedescription_descriptions'}{'contents'}[3];
-$result_trees{'nodedescription_descriptions'}{'contents'}[4]{'contents'}[1] = 
$result_trees{'nodedescription_descriptions'}{'contents'}[3]{'extra'}{'node_description'};
+$result_trees{'nodedescription_descriptions'}{'contents'}[4]{'contents'}[2] = 
$result_trees{'nodedescription_descriptions'}{'contents'}[3]{'extra'}{'node_description'};
 
$result_trees{'nodedescription_descriptions'}{'contents'}[5]{'extra'}{'node_description'}{'extra'}{'element_node'}
 = $result_trees{'nodedescription_descriptions'}{'contents'}[5];
-$result_trees{'nodedescription_descriptions'}{'contents'}[6]{'contents'}[1] = 
$result_trees{'nodedescription_descriptions'}{'contents'}[5]{'extra'}{'node_description'};
+$result_trees{'nodedescription_descriptions'}{'contents'}[6]{'contents'}[2] = 
$result_trees{'nodedescription_descriptions'}{'contents'}[5]{'extra'}{'node_description'};
 
$result_trees{'nodedescription_descriptions'}{'contents'}[7]{'extra'}{'node_description'}{'extra'}{'element_node'}
 = $result_trees{'nodedescription_descriptions'}{'contents'}[7];
-$result_trees{'nodedescription_descriptions'}{'contents'}[8]{'contents'}[1] = 
$result_trees{'nodedescription_descriptions'}{'contents'}[7]{'extra'}{'node_description'};
+$result_trees{'nodedescription_descriptions'}{'contents'}[8]{'contents'}[2] = 
$result_trees{'nodedescription_descriptions'}{'contents'}[7]{'extra'}{'node_description'};
 
$result_trees{'nodedescription_descriptions'}{'contents'}[9]{'extra'}{'node_description'}{'extra'}{'element_node'}
 = $result_trees{'nodedescription_descriptions'}{'contents'}[9];
-$result_trees{'nodedescription_descriptions'}{'contents'}[10]{'contents'}[1] = 
$result_trees{'nodedescription_descriptions'}{'contents'}[9]{'extra'}{'node_description'};
+$result_trees{'nodedescription_descriptions'}{'contents'}[10]{'contents'}[2] = 
$result_trees{'nodedescription_descriptions'}{'contents'}[9]{'extra'}{'node_description'};
 
$result_trees{'nodedescription_descriptions'}{'contents'}[11]{'extra'}{'node_description'}{'extra'}{'element_node'}
 = $result_trees{'nodedescription_descriptions'}{'contents'}[11];
-$result_trees{'nodedescription_descriptions'}{'contents'}[12]{'contents'}[1] = 
$result_trees{'nodedescription_descriptions'}{'contents'}[11]{'extra'}{'node_description'};
+$result_trees{'nodedescription_descriptions'}{'contents'}[12]{'contents'}[2] = 
$result_trees{'nodedescription_descriptions'}{'contents'}[11]{'extra'}{'node_description'};
 
$result_trees{'nodedescription_descriptions'}{'contents'}[13]{'extra'}{'node_description'}{'extra'}{'element_node'}
 = $result_trees{'nodedescription_descriptions'}{'contents'}[13];
-$result_trees{'nodedescription_descriptions'}{'contents'}[14]{'contents'}[1] = 
$result_trees{'nodedescription_descriptions'}{'contents'}[13]{'extra'}{'node_description'};
+$result_trees{'nodedescription_descriptions'}{'contents'}[14]{'contents'}[2] = 
$result_trees{'nodedescription_descriptions'}{'contents'}[13]{'extra'}{'node_description'};
 
$result_trees{'nodedescription_descriptions'}{'contents'}[15]{'extra'}{'node_description'}{'extra'}{'element_node'}
 = $result_trees{'nodedescription_descriptions'}{'contents'}[15];
-$result_trees{'nodedescription_descriptions'}{'contents'}[16]{'contents'}[1] = 
$result_trees{'nodedescription_descriptions'}{'contents'}[15]{'extra'}{'node_description'};
+$result_trees{'nodedescription_descriptions'}{'contents'}[16]{'contents'}[2] = 
$result_trees{'nodedescription_descriptions'}{'contents'}[15]{'extra'}{'node_description'};
 
 $result_texis{'nodedescription_descriptions'} = '@node Top
 @top test of nodedescription used in menu
diff --git a/tp/t/results/menu/nodedescriptionblock_descriptions.pl 
b/tp/t/results/menu/nodedescriptionblock_descriptions.pl
index 4d9a67552e..613c2f7e64 100644
--- a/tp/t/results/menu/nodedescriptionblock_descriptions.pl
+++ b/tp/t/results/menu/nodedescriptionblock_descriptions.pl
@@ -11,23 +11,28 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'test of nodedescriptionblock used in menu'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'test of nodedescriptionblock used in menu'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -391,23 +399,28 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'toto'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'toto'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'node_description' => {
@@ -598,24 +611,27 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Toto'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Toto'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -647,23 +663,28 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'titi'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'titi'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'node_description' => {
@@ -743,24 +764,27 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Titi'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Titi'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -786,23 +810,28 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'other'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'other'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'node_description' => {
@@ -962,24 +991,27 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Other'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Other'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1005,23 +1037,28 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'a somewhat long node without description nor 
following space'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'a somewhat long node without description nor 
following space'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'node_description' => {
@@ -1130,24 +1167,27 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Somewhat long'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Somewhat long'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1179,23 +1219,28 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node double nodedescriptionblock'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node double nodedescriptionblock'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'node_description' => {
@@ -1275,24 +1320,27 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'test double'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'test double'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1389,29 +1437,29 @@ $result_trees{'nodedescriptionblock_descriptions'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[0];
-$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[0];
 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[3]{'extra'}{'node_description'}{'extra'}{'element_node'}
 = $result_trees{'nodedescriptionblock_descriptions'}{'contents'}[3];
 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[3]{'extra'}{'node_long_description'}{'extra'}{'element_node'}
 = $result_trees{'nodedescriptionblock_descriptions'}{'contents'}[3];
-$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[4]{'contents'}[1]
 = 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[3]{'extra'}{'node_description'};
-$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[4]{'contents'}[3]
 = 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[3]{'extra'}{'node_long_description'};
+$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[4]{'contents'}[2]
 = 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[3]{'extra'}{'node_description'};
+$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[4]{'contents'}[4]
 = 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[3]{'extra'}{'node_long_description'};
 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[5]{'extra'}{'node_description'}{'extra'}{'element_node'}
 = $result_trees{'nodedescriptionblock_descriptions'}{'contents'}[5];
 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[5]{'extra'}{'node_long_description'}
 = 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[5]{'extra'}{'node_description'};
-$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[6]{'contents'}[1]
 = 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[5]{'extra'}{'node_description'};
+$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[6]{'contents'}[2]
 = 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[5]{'extra'}{'node_description'};
 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[7]{'extra'}{'node_description'}{'extra'}{'element_node'}
 = $result_trees{'nodedescriptionblock_descriptions'}{'contents'}[7];
 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[7]{'extra'}{'node_long_description'}
 = 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[7]{'extra'}{'node_description'};
-$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[8]{'contents'}[1]
 = 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[7]{'extra'}{'node_description'};
+$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[8]{'contents'}[2]
 = 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[7]{'extra'}{'node_description'};
 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[9]{'extra'}{'node_description'}{'extra'}{'element_node'}
 = $result_trees{'nodedescriptionblock_descriptions'}{'contents'}[9];
 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[9]{'extra'}{'node_long_description'}{'extra'}{'element_node'}
 = $result_trees{'nodedescriptionblock_descriptions'}{'contents'}[9];
-$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[10]{'contents'}[1]
 = 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[9]{'extra'}{'node_long_description'};
-$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[10]{'contents'}[3]
 = 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[9]{'extra'}{'node_description'};
+$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[10]{'contents'}[2]
 = 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[9]{'extra'}{'node_long_description'};
+$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[10]{'contents'}[4]
 = 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[9]{'extra'}{'node_description'};
 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[11]{'extra'}{'node_description'}{'extra'}{'element_node'}
 = $result_trees{'nodedescriptionblock_descriptions'}{'contents'}[11];
 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[11]{'extra'}{'node_long_description'}
 = 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[11]{'extra'}{'node_description'};
-$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[12]{'contents'}[1]
 = 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[11]{'extra'}{'node_description'};
-$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[12]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'nodedescriptionblock_descriptions'}{'contents'}[11];
+$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[12]{'contents'}[2]
 = 
$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[11]{'extra'}{'node_description'};
+$result_trees{'nodedescriptionblock_descriptions'}{'contents'}[12]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'nodedescriptionblock_descriptions'}{'contents'}[11];
 
 $result_texis{'nodedescriptionblock_descriptions'} = '@node Top
 @top test of nodedescriptionblock used in menu
diff --git a/tp/t/results/menu/part_appendix_in_generated_menu.pl 
b/tp/t/results/menu/part_appendix_in_generated_menu.pl
index 4e17b427bc..183c8736d6 100644
--- a/tp/t/results/menu/part_appendix_in_generated_menu.pl
+++ b/tp/t/results/menu/part_appendix_in_generated_menu.pl
@@ -11,23 +11,28 @@ $result_trees{'part_appendix_in_generated_menu'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'part_appendix_in_generated_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'part_appendix_in_generated_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -113,24 +126,27 @@ $result_trees{'part_appendix_in_generated_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -150,23 +166,28 @@ $result_trees{'part_appendix_in_generated_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sec'
@@ -181,24 +202,27 @@ $result_trees{'part_appendix_in_generated_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendixsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendixsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -218,24 +242,27 @@ $result_trees{'part_appendix_in_generated_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'P1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'P1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -253,23 +280,28 @@ $result_trees{'part_appendix_in_generated_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap2'
@@ -284,24 +316,27 @@ $result_trees{'part_appendix_in_generated_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -322,23 +357,28 @@ $result_trees{'part_appendix_in_generated_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'app'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'app'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'app'
@@ -353,23 +393,28 @@ $result_trees{'part_appendix_in_generated_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'GGG'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'GGG'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'appendix',
       'extra' => {
         'section_number' => 'A'
       },
diff --git a/tp/t/results/menu/reference_to_external_manual.pl 
b/tp/t/results/menu/reference_to_external_manual.pl
index 7f02c7ad30..f7f721c811 100644
--- a/tp/t/results/menu/reference_to_external_manual.pl
+++ b/tp/t/results/menu/reference_to_external_manual.pl
@@ -18,24 +18,27 @@ $result_trees{'reference_to_external_manual'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -161,7 +164,7 @@ $result_trees{'reference_to_external_manual'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'reference_to_external_manual'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'reference_to_external_manual'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'reference_to_external_manual'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'reference_to_external_manual'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'reference_to_external_manual'} = '
 @node first
diff --git a/tp/t/results/menu/sc_in_menu.pl b/tp/t/results/menu/sc_in_menu.pl
index 0984cf0002..852690bee2 100644
--- a/tp/t/results/menu/sc_in_menu.pl
+++ b/tp/t/results/menu/sc_in_menu.pl
@@ -18,24 +18,27 @@ $result_trees{'sc_in_menu'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -396,37 +399,40 @@ $result_trees{'sc_in_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'sc',
               'contents' => [
                 {
+                  'cmdname' => 'sc',
                   'contents' => [
                     {
-                      'text' => 'node'
+                      'contents' => [
+                        {
+                          'text' => 'node'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 16
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 16
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -707,9 +713,9 @@ $result_trees{'sc_in_menu'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[0];
-$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1];
-$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[3];
+$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[0];
+$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1];
+$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[3];
 
 $result_texis{'sc_in_menu'} = '
 @node first
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 e77aab18b8..631de70e5e 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
@@ -11,23 +11,28 @@ $result_trees{'space_and_commands_in_menu_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'space_and_commands_in_menu_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -640,29 +648,34 @@ $result_trees{'space_and_commands_in_menu_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap '
-            },
-            {
-              'cmdname' => ':'
-            },
-            {
-              'text' => ' b'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap '
+                },
+                {
+                  'cmdname' => ':'
+                },
+                {
+                  'text' => ' b'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap-b'
@@ -677,23 +690,28 @@ $result_trees{'space_and_commands_in_menu_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
@@ -709,29 +727,29 @@ $result_trees{'space_and_commands_in_menu_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[2];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[3];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[2];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[0];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[1];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[2];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[3]{'contents'}[0];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[3]{'contents'}[1];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[3]{'contents'}[2];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[3]{'contents'}[0];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[3]{'contents'}[0];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[3]{'contents'}[1];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[3]{'contents'}[2];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'contents'}[3]{'contents'}[3];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[2];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[2];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[3];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[2];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[0];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[2];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[3]{'contents'}[0];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[3]{'contents'}[1];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[7]{'contents'}[3]{'contents'}[2];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[8]{'contents'}[3]{'contents'}[0];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[3]{'contents'}[0];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[3]{'contents'}[1];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[3]{'contents'}[2];
+$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[3]
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'contents'}[9]{'contents'}[3]{'contents'}[3];
 
 $result_texis{'space_and_commands_in_menu_node'} = '@node Top
 @top top
diff --git a/tp/t/results/menu/submenu_in_example.pl 
b/tp/t/results/menu/submenu_in_example.pl
index 94073ef039..432e88d203 100644
--- a/tp/t/results/menu/submenu_in_example.pl
+++ b/tp/t/results/menu/submenu_in_example.pl
@@ -11,24 +11,27 @@ $result_trees{'submenu_in_example'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/menu/verb_in_menu_description.pl 
b/tp/t/results/menu/verb_in_menu_description.pl
index dc21f1086b..435dcb912a 100644
--- a/tp/t/results/menu/verb_in_menu_description.pl
+++ b/tp/t/results/menu/verb_in_menu_description.pl
@@ -11,23 +11,28 @@ $result_trees{'verb_in_menu_description'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'first'
@@ -42,24 +47,27 @@ $result_trees{'verb_in_menu_description'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -227,7 +235,7 @@ $result_trees{'verb_in_menu_description'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'verb_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'verb_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'verb_in_menu_description'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'verb_in_menu_description'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'verb_in_menu_description'} = '@node first
 @top top
diff --git 
a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl 
b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
index 304e98e5fd..fa5efa4f0b 100644
--- a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
+++ b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
@@ -1458,23 +1458,28 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => ' 
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => ' 
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -1489,24 +1494,27 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'test quotes'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'test quotes'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1524,23 +1532,28 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -1555,24 +1568,27 @@ $result_trees{'codequoteundirected_codequotebacktick'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 c08be80354..60be670f96 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
@@ -54,32 +54,37 @@ $result_trees{'comment_space_command_on_line'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'comment_at_end' => {
-              'args' => [
+              'contents' => [
                 {
-                  'text' => ' @node Top
-',
-                  'type' => 'rawline_arg'
+                  'text' => 'Top'
                 }
               ],
-              'cmdname' => 'comment'
-            },
-            'spaces_after_argument' => {
-              'text' => '  '
+              'info' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'text' => ' @node Top
+',
+                      'type' => 'rawline_arg'
+                    }
+                  ],
+                  'cmdname' => 'comment'
+                },
+                'spaces_after_argument' => {
+                  'text' => '  '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -94,36 +99,39 @@ $result_trees{'comment_space_command_on_line'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top element'
-            },
-            {
-              'cmdname' => ' '
-            }
-          ],
-          'info' => {
-            'comment_at_end' => {
-              'args' => [
+              'contents' => [
                 {
-                  'text' => ' @top
-',
-                  'type' => 'rawline_arg'
+                  'text' => 'top element'
+                },
+                {
+                  'cmdname' => ' '
                 }
               ],
-              'cmdname' => 'comment'
-            },
-            'spaces_after_argument' => {
-              'text' => ' '
+              'info' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'text' => ' @top
+',
+                      'type' => 'rawline_arg'
+                    }
+                  ],
+                  'cmdname' => 'comment'
+                },
+                'spaces_after_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -141,32 +149,37 @@ $result_trees{'comment_space_command_on_line'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'comment_at_end' => {
-              'args' => [
+              'contents' => [
                 {
-                  'text' => ' @node chap
-',
-                  'type' => 'rawline_arg'
+                  'text' => 'chap'
                 }
               ],
-              'cmdname' => 'comment'
-            },
-            'spaces_after_argument' => {
-              'text' => ' '
+              'info' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'text' => ' @node chap
+',
+                      'type' => 'rawline_arg'
+                    }
+                  ],
+                  'cmdname' => 'comment'
+                },
+                'spaces_after_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -182,36 +195,39 @@ $result_trees{'comment_space_command_on_line'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            },
-            {
-              'cmdname' => ' '
-            }
-          ],
-          'info' => {
-            'comment_at_end' => {
-              'args' => [
+              'contents' => [
                 {
-                  'text' => ' @chapter
-',
-                  'type' => 'rawline_arg'
+                  'text' => 'Chapter'
+                },
+                {
+                  'cmdname' => ' '
                 }
               ],
-              'cmdname' => 'comment'
-            },
-            'spaces_after_argument' => {
-              'text' => ' '
+              'info' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'text' => ' @chapter
+',
+                      'type' => 'rawline_arg'
+                    }
+                  ],
+                  'cmdname' => 'comment'
+                },
+                'spaces_after_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -622,8 +638,8 @@ $result_trees{'comment_space_command_on_line'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[11]{'extra'}{'float_section'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[4];
+$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[6]{'extra'}{'element_node'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[3];
+$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[12]{'extra'}{'float_section'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[4];
 
 $result_texis{'comment_space_command_on_line'} = '@settitle Settitle @ @c 
settittle
 
diff --git a/tp/t/results/misc_commands/no_empty_line_between_headings.pl 
b/tp/t/results/misc_commands/no_empty_line_between_headings.pl
index b76a7561d9..307b114b06 100644
--- a/tp/t/results/misc_commands/no_empty_line_between_headings.pl
+++ b/tp/t/results/misc_commands/no_empty_line_between_headings.pl
@@ -11,24 +11,27 @@ $result_trees{'no_empty_line_between_headings'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -69,23 +72,28 @@ $result_trees{'no_empty_line_between_headings'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
@@ -99,23 +107,28 @@ $result_trees{'no_empty_line_between_headings'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {
         'section_number' => '1.1'
       },
diff --git a/tp/t/results/misc_commands/nodedescription.pl 
b/tp/t/results/misc_commands/nodedescription.pl
index 1c0d48cf51..413724558c 100644
--- a/tp/t/results/misc_commands/nodedescription.pl
+++ b/tp/t/results/misc_commands/nodedescription.pl
@@ -45,23 +45,28 @@ $result_trees{'nodedescription'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -76,24 +81,27 @@ $result_trees{'nodedescription'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -111,23 +119,28 @@ $result_trees{'nodedescription'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'node_description' => {
@@ -188,24 +201,27 @@ $result_trees{'nodedescription'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -275,8 +291,8 @@ $result_trees{'nodedescription'} = {
   'type' => 'document_root'
 };
 
$result_trees{'nodedescription'}{'contents'}[3]{'extra'}{'node_description'}{'extra'}{'element_node'}
 = $result_trees{'nodedescription'}{'contents'}[3];
-$result_trees{'nodedescription'}{'contents'}[4]{'contents'}[1] = 
$result_trees{'nodedescription'}{'contents'}[3]{'extra'}{'node_description'};
-$result_trees{'nodedescription'}{'contents'}[4]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'nodedescription'}{'contents'}[3];
+$result_trees{'nodedescription'}{'contents'}[4]{'contents'}[2] = 
$result_trees{'nodedescription'}{'contents'}[3]{'extra'}{'node_description'};
+$result_trees{'nodedescription'}{'contents'}[4]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'nodedescription'}{'contents'}[3];
 
 $result_texis{'nodedescription'} = '@nodedescription out of any node
 
diff --git a/tp/t/results/misc_commands/ref_in_center.pl 
b/tp/t/results/misc_commands/ref_in_center.pl
index 53bac52b64..4723681bc8 100644
--- a/tp/t/results/misc_commands/ref_in_center.pl
+++ b/tp/t/results/misc_commands/ref_in_center.pl
@@ -16,23 +16,28 @@ $result_trees{'ref_in_center'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'ref_in_center'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'ref_in_center'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -113,24 +126,27 @@ $result_trees{'ref_in_center'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -265,7 +281,7 @@ $result_trees{'ref_in_center'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ref_in_center'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_center'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_center'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_center'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'ref_in_center'} = '@node Top
 @top top
diff --git a/tp/t/results/misc_commands/test_allowcodebreaks.pl 
b/tp/t/results/misc_commands/test_allowcodebreaks.pl
index c7caaab94e..a0b658e0fa 100644
--- a/tp/t/results/misc_commands/test_allowcodebreaks.pl
+++ b/tp/t/results/misc_commands/test_allowcodebreaks.pl
@@ -16,23 +16,28 @@ $result_trees{'test_allowcodebreaks'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'test_allowcodebreaks'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 994ecf455e..f355e81539 100644
--- a/tp/t/results/misc_commands/text_before_line_command.pl
+++ b/tp/t/results/misc_commands/text_before_line_command.pl
@@ -61,24 +61,27 @@ $result_trees{'text_before_line_command'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'LD Version Scripts'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'LD Version Scripts'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -102,24 +105,27 @@ $result_trees{'text_before_line_command'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'LD Version Scripts'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'LD Version Scripts'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -267,8 +273,8 @@ $result_trees{'text_before_line_command'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'text_before_line_command'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'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'}[1]{'contents'}[1];
+$result_trees{'text_before_line_command'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'quotation'}
 = $result_trees{'text_before_line_command'}{'contents'}[2]{'contents'}[5];
+$result_trees{'text_before_line_command'}{'contents'}[2]{'contents'}[5]{'extra'}{'authors'}[0]
 = 
$result_trees{'text_before_line_command'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'text_before_line_command'} = 'before title @title the title
 
diff --git a/tp/t/results/moresectioning/anchor_in_footnote.pl 
b/tp/t/results/moresectioning/anchor_in_footnote.pl
index 51c1e98f4c..76131e5b9f 100644
--- a/tp/t/results/moresectioning/anchor_in_footnote.pl
+++ b/tp/t/results/moresectioning/anchor_in_footnote.pl
@@ -11,23 +11,28 @@ $result_trees{'anchor_in_footnote'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'anchor_in_footnote'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -244,23 +252,28 @@ $result_trees{'anchor_in_footnote'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -275,24 +288,27 @@ $result_trees{'anchor_in_footnote'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -347,8 +363,8 @@ $result_trees{'anchor_in_footnote'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'anchor_in_footnote'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_footnote'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'anchor_in_footnote'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_footnote'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'anchor_in_footnote'} = '@node Top
 @top Top
diff --git a/tp/t/results/moresectioning/anchor_in_footnote_separate.pl 
b/tp/t/results/moresectioning/anchor_in_footnote_separate.pl
index e810b1a5aa..7006e0d7db 100644
--- a/tp/t/results/moresectioning/anchor_in_footnote_separate.pl
+++ b/tp/t/results/moresectioning/anchor_in_footnote_separate.pl
@@ -45,23 +45,28 @@ $result_trees{'anchor_in_footnote_separate'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -76,24 +81,27 @@ $result_trees{'anchor_in_footnote_separate'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -278,23 +286,28 @@ $result_trees{'anchor_in_footnote_separate'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -309,24 +322,27 @@ $result_trees{'anchor_in_footnote_separate'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -381,8 +397,8 @@ $result_trees{'anchor_in_footnote_separate'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'anchor_in_footnote_separate'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_footnote_separate'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'anchor_in_footnote_separate'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_footnote_separate'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'anchor_in_footnote_separate'} = '@footnotestyle separate
 @node Top
diff --git 
a/tp/t/results/moresectioning/anchor_in_footnote_separate_split_node.pl 
b/tp/t/results/moresectioning/anchor_in_footnote_separate_split_node.pl
index 68b770e24d..024ac2a0c5 100644
--- a/tp/t/results/moresectioning/anchor_in_footnote_separate_split_node.pl
+++ b/tp/t/results/moresectioning/anchor_in_footnote_separate_split_node.pl
@@ -50,23 +50,28 @@ $result_trees{'anchor_in_footnote_separate_split_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -81,24 +86,27 @@ $result_trees{'anchor_in_footnote_separate_split_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -283,23 +291,28 @@ $result_trees{'anchor_in_footnote_separate_split_node'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -314,24 +327,27 @@ $result_trees{'anchor_in_footnote_separate_split_node'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -386,8 +402,8 @@ $result_trees{'anchor_in_footnote_separate_split_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_footnote_separate_split_node'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_footnote_separate_split_node'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'anchor_in_footnote_separate_split_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_footnote_separate_split_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'anchor_in_footnote_separate_split_node'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_footnote_separate_split_node'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'anchor_in_footnote_separate_split_node'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_footnote_separate_split_node'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'anchor_in_footnote_separate_split_node'} = '@footnotestyle 
separate
 @node Top
diff --git a/tp/t/results/moresectioning/anchor_in_footnote_split_node.pl 
b/tp/t/results/moresectioning/anchor_in_footnote_split_node.pl
index 4a49f574ea..b6e222bc9c 100644
--- a/tp/t/results/moresectioning/anchor_in_footnote_split_node.pl
+++ b/tp/t/results/moresectioning/anchor_in_footnote_split_node.pl
@@ -16,23 +16,28 @@ $result_trees{'anchor_in_footnote_split_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'anchor_in_footnote_split_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -249,23 +257,28 @@ $result_trees{'anchor_in_footnote_split_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -280,24 +293,27 @@ $result_trees{'anchor_in_footnote_split_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -352,8 +368,8 @@ $result_trees{'anchor_in_footnote_split_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_footnote_split_node'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_footnote_split_node'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'anchor_in_footnote_split_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_footnote_split_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'anchor_in_footnote_split_node'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_footnote_split_node'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'anchor_in_footnote_split_node'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_footnote_split_node'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'anchor_in_footnote_split_node'} = '@node Top
 @top Top
diff --git a/tp/t/results/moresectioning/chapter_sections.pl 
b/tp/t/results/moresectioning/chapter_sections.pl
index be11e50b07..a6d6d96880 100644
--- a/tp/t/results/moresectioning/chapter_sections.pl
+++ b/tp/t/results/moresectioning/chapter_sections.pl
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'chapter_sections'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -52,24 +55,27 @@ $result_trees{'chapter_sections'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'First chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'First chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -95,24 +101,27 @@ $result_trees{'chapter_sections'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'second'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -138,24 +147,27 @@ $result_trees{'chapter_sections'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -181,24 +193,27 @@ $result_trees{'chapter_sections'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section of chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section of chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -224,24 +239,27 @@ $result_trees{'chapter_sections'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -267,24 +285,27 @@ $result_trees{'chapter_sections'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -310,23 +331,28 @@ $result_trees{'chapter_sections'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '3'
       },
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 5dc82fa756..4dcb368a2e 100644
--- a/tp/t/results/moresectioning/character_and_spaces_in_refs.pl
+++ b/tp/t/results/moresectioning/character_and_spaces_in_refs.pl
@@ -16,23 +16,28 @@ $result_trees{'character_and_spaces_in_refs'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -48,24 +53,27 @@ $result_trees{'character_and_spaces_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Test refs'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Test refs'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -237,23 +245,28 @@ $result_trees{'character_and_spaces_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node to avoid DocBook or LaTeX ignored'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node to avoid DocBook or LaTeX ignored'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-to-avoid-DocBook-or-LaTeX-ignored'
@@ -269,24 +282,27 @@ $result_trees{'character_and_spaces_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -762,84 +778,89 @@ $result_trees{'character_and_spaces_in_refs'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'other nodes'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '!_"#$%&\'()*+-.'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'node to avoid DocBook or LaTeX ignored'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '!_"#$%&\'()*+-.'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'node-to-avoid-DocBook-or-LaTeX-ignored'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'node to avoid DocBook or LaTeX ignored'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'node-to-avoid-DocBook-or-LaTeX-ignored'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'other-nodes'
@@ -855,24 +876,27 @@ $result_trees{'character_and_spaces_in_refs'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter with nodes'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter with nodes'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1093,85 +1117,88 @@ $result_trees{'character_and_spaces_in_refs'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => '!_"#$%&\'()*+-.'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '/;<=>?[\\]^_`|~'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '!_"#$%&\'()*+-.'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '/;<=>?[\\]^_`|~'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1193,75 +1220,78 @@ $result_trees{'character_and_spaces_in_refs'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => '/;<=>?[\\]^_`|~'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'local   node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '/;<=>?[\\]^_`|~'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'local-node'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => '!_"#$%&\'()*+-.'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'local   node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'local-node'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '!_"#$%&\'()*+-.'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1283,59 +1313,62 @@ $result_trees{'character_and_spaces_in_refs'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'local   node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '/;<=>?[\\]^_`|~'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'local   node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '/;<=>?[\\]^_`|~'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1369,32 +1402,32 @@ $result_trees{'character_and_spaces_in_refs'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[4]{'contents'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'contents'}[3];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[8]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[8]{'contents'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'contents'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'contents'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[5]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[5]{'args'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[5]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[5]{'args'}[2]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[5]{'args'}[3]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[7]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[7]{'args'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[7]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[7]{'args'}[2]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[7]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[7]{'args'}[3]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[8]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[8]{'args'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[8]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[8]{'args'}[2]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[8]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[8]{'args'}[3]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[9]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[9]{'args'}[2]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[9]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[9]{'args'}[3]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[3];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[4]{'contents'}[8]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[4]{'contents'}[8]{'contents'}[0]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[8]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[8]{'contents'}[4]{'contents'}[0]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[8]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[8]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[8]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[8]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[8]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[8]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[8]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[8]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[9]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[9]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[9]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[9]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'character_and_spaces_in_refs'} = '@node Top
 @top Test refs
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 cc1aa96418..94858c49a3 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
@@ -8,23 +8,28 @@ use utf8;
 $result_trees{'character_and_spaces_in_refs_out'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -50,24 +55,27 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
       },
       {},
       {
-        'args' => [
+        'cmdname' => 'top',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Test refs'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Test refs'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'top',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -243,23 +251,28 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node to avoid DocBook or LaTeX ignored'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node to avoid DocBook or LaTeX ignored'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-to-avoid-DocBook-or-LaTeX-ignored'
@@ -277,24 +290,27 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'chapter',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'first chapter'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'first chapter'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'chapter',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -774,84 +790,89 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
   },
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'other nodes'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '!_"#$%&\'()*+-.'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'node to avoid DocBook or LaTeX ignored'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '!_"#$%&\'()*+-.'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'node-to-avoid-DocBook-or-LaTeX-ignored'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'node to avoid DocBook or LaTeX ignored'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'node-to-avoid-DocBook-or-LaTeX-ignored'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'other-nodes'
@@ -869,24 +890,27 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'chapter',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Chapter with nodes'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Chapter with nodes'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'chapter',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -1111,85 +1135,88 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
   },
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => '!_"#$%&\'()*+-.'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '/;<=>?[\\]^_`|~'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '!_"#$%&\'()*+-.'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '/;<=>?[\\]^_`|~'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1217,75 +1244,78 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
   },
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => '/;<=>?[\\]^_`|~'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'local   node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '/;<=>?[\\]^_`|~'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'local-node'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => '!_"#$%&\'()*+-.'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'local   node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'local-node'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '!_"#$%&\'()*+-.'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1313,59 +1343,62 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
   },
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'local   node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '/;<=>?[\\]^_`|~'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'local   node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'other nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '/;<=>?[\\]^_`|~'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'other-nodes'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'other nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'other-nodes'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1403,36 +1436,36 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
   }
 ];
 $result_trees{'character_and_spaces_in_refs_out'}[0]{'unit_contents'}[1] = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'unit_command'};
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'unit_contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'unit_contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'unit_contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'unit_contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'unit_contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'unit_contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'unit_contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'unit_contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 $result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[0] = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_command'};
-$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[3]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[3]{'contents'}[4]{'contents'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[3]{'contents'}[6]{'contents'}[0]{'contents'}[3];
-$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[3]{'contents'}[8]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[3]{'contents'}[8]{'contents'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[7]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[7]{'contents'}[6]{'contents'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[2]{'unit_command'}{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[2]{'unit_command'}{'args'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[2]{'unit_command'}{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[2]{'unit_command'}{'args'}[2]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[2]{'unit_command'}{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[2]{'unit_command'}{'args'}[3]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[4]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[3];
+$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[4]{'contents'}[8]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[4]{'contents'}[8]{'contents'}[0]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[8]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[8]{'contents'}[4]{'contents'}[0]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[8]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[1]{'unit_contents'}[1]{'contents'}[8]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[2]{'unit_command'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[2]{'unit_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[2]{'unit_command'}{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[2]{'unit_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[2]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[2]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'character_and_spaces_in_refs_out'}[2]{'unit_contents'}[0] = 
$result_trees{'character_and_spaces_in_refs_out'}[2]{'unit_command'};
-$result_trees{'character_and_spaces_in_refs_out'}[2]{'unit_contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[2]{'unit_contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[2]{'unit_contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[2]{'unit_contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[2]{'unit_contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[2]{'unit_contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[3]{'unit_command'}{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[3]{'unit_command'}{'args'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[3]{'unit_command'}{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[3]{'unit_command'}{'args'}[2]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[3]{'unit_command'}{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[3]{'unit_command'}{'args'}[3]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[2]{'unit_contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[2]{'unit_contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[2]{'unit_contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[2]{'unit_contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[2]{'unit_contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[2]{'unit_contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[3]{'unit_command'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[3]{'unit_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[3]{'unit_command'}{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[3]{'unit_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[3]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[3]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'character_and_spaces_in_refs_out'}[3]{'unit_contents'}[0] = 
$result_trees{'character_and_spaces_in_refs_out'}[3]{'unit_command'};
-$result_trees{'character_and_spaces_in_refs_out'}[4]{'unit_command'}{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[4]{'unit_command'}{'args'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[4]{'unit_command'}{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[4]{'unit_command'}{'args'}[2]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[4]{'unit_command'}{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[4]{'unit_command'}{'args'}[3]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[4]{'unit_command'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[4]{'unit_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[4]{'unit_command'}{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[4]{'unit_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[4]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[4]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'character_and_spaces_in_refs_out'}[4]{'unit_contents'}[0] = 
$result_trees{'character_and_spaces_in_refs_out'}[4]{'unit_command'};
-$result_trees{'character_and_spaces_in_refs_out'}[5]{'unit_command'}{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[5]{'unit_command'}{'args'}[2]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[5]{'unit_command'}{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[5]{'unit_command'}{'args'}[3]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[5]{'unit_command'}{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[5]{'unit_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[5]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[5]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'character_and_spaces_in_refs_out'}[5]{'unit_contents'}[0] = 
$result_trees{'character_and_spaces_in_refs_out'}[5]{'unit_command'};
 
 $result_texis{'character_and_spaces_in_refs_out'} = '@node Top
diff --git a/tp/t/results/moresectioning/complex.pl 
b/tp/t/results/moresectioning/complex.pl
index 30a99f19da..97a9d6cd53 100644
--- a/tp/t/results/moresectioning/complex.pl
+++ b/tp/t/results/moresectioning/complex.pl
@@ -8,19 +8,22 @@ use utf8;
 $result_trees{'complex'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'menu',
           'contents' => [
@@ -379,60 +382,65 @@ $result_trees{'complex'} = [
         'type' => 'before_node_section'
       },
       {
-        'args' => [
-          {
-            'contents' => [
-              {
-                'text' => 'Top'
-              }
-            ],
-            'type' => 'line_arg'
-          },
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'First node'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
-              },
-              'normalized' => 'First-node'
-            },
-            'type' => 'line_arg'
-          },
-          {
-            'contents' => [
-              {
-                'text' => '('
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'type' => 'line_arg'
               },
               {
-                'text' => 'dir'
+                'contents' => [
+                  {
+                    'text' => 'First node'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'First-node'
+                },
+                'type' => 'line_arg'
               },
               {
-                'text' => ')'
-              }
-            ],
-            'extra' => {
-              'manual_content' => {
                 'contents' => [
-                  {}
-                ]
-              }
-            },
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                  {
+                    'text' => '('
+                  },
+                  {
+                    'text' => 'dir'
+                  },
+                  {
+                    'text' => ')'
+                  }
+                ],
+                'extra' => {
+                  'manual_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  }
+                },
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'Top'
@@ -453,24 +461,27 @@ $result_trees{'complex'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first node chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first node chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -716,58 +727,63 @@ $result_trees{'complex'} = [
     },
     'unit_contents' => [
       {
-        'args' => [
-          {
-            'contents' => [
-              {
-                'text' => 'First node'
-              }
-            ],
-            'type' => 'line_arg'
-          },
-          {
-            'type' => 'line_arg'
-          },
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'First node'
+                  }
+                ],
+                'type' => 'line_arg'
+              },
+              {
+                'type' => 'line_arg'
               },
-              'normalized' => 'Top'
-            },
-            'type' => 'line_arg'
-          },
-          {
-            'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'Top'
+                },
+                'type' => 'line_arg'
               },
-              'normalized' => 'Top'
-            },
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+              {
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'Top'
+                },
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'First-node'
@@ -788,24 +804,27 @@ $result_trees{'complex'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'unnumberedsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1072,23 +1091,28 @@ $result_trees{'complex'} = [
     },
     'unit_contents' => [
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'unnumbered'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'unnumbered'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'unnumbered'
@@ -1109,24 +1133,27 @@ $result_trees{'complex'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'unnumberedsubsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsubsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1146,23 +1173,28 @@ $result_trees{'complex'} = [
     },
     'unit_contents' => [
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'unnumbered sub'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'unnumbered sub'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'unnumbered-sub'
@@ -1183,24 +1215,27 @@ $result_trees{'complex'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1220,23 +1255,28 @@ $result_trees{'complex'} = [
     },
     'unit_contents' => [
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'numbered sub'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'numbered sub'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'numbered-sub'
@@ -1257,24 +1297,27 @@ $result_trees{'complex'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'unnumberedsubsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered subsection2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered subsection2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsubsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1294,23 +1337,28 @@ $result_trees{'complex'} = [
     },
     'unit_contents' => [
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'unnumbered sub2'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'unnumbered sub2'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'unnumbered-sub2'
@@ -1331,24 +1379,27 @@ $result_trees{'complex'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered subsection2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered subsection2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1368,23 +1419,28 @@ $result_trees{'complex'} = [
     },
     'unit_contents' => [
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'numbered sub2'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'numbered sub2'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'numbered-sub2'
@@ -1405,24 +1461,27 @@ $result_trees{'complex'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'unnumberedsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered section2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered section2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1548,23 +1607,28 @@ $result_trees{'complex'} = [
     },
     'unit_contents' => [
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'unnumbered2'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'unnumbered2'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'unnumbered2'
@@ -1585,24 +1649,27 @@ $result_trees{'complex'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered subsection3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered subsection3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1627,23 +1694,28 @@ $result_trees{'complex'} = [
     },
     'unit_contents' => [
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'numbered sub3'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'numbered sub3'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'numbered-sub3'
@@ -1664,24 +1736,27 @@ $result_trees{'complex'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1703,23 +1778,28 @@ $result_trees{'complex'} = [
     },
     'unit_contents' => [
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'numbered'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'numbered'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'numbered'
@@ -1736,46 +1816,49 @@ $result_trees{'complex'} = [
       },
       {},
       {
-        'args' => [
-          {
-            'contents' => [
-              {
-                'text' => 'between node'
-              }
-            ],
-            'type' => 'line_arg'
-          },
-          {
-            'type' => 'line_arg'
-          },
-          {
-            'type' => 'line_arg'
-          },
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'between node'
+                  }
+                ],
+                'type' => 'line_arg'
               },
-              'normalized' => 'Top'
-            },
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+              {
+                'type' => 'line_arg'
+              },
+              {
+                'type' => 'line_arg'
+              },
+              {
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'Top'
+                },
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'node',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -1815,24 +1898,27 @@ $result_trees{'complex'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second node chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'second node chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1868,59 +1954,62 @@ $result_trees{'complex'} = [
     },
     'unit_contents' => [
       {
-        'args' => [
-          {
-            'contents' => [
-              {
-                'text' => 'Second node'
-              }
-            ],
-            'type' => 'line_arg'
-          },
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Third node unnumbered'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'Second node'
+                  }
+                ],
+                'type' => 'line_arg'
               },
-              'normalized' => 'Third-node-unnumbered'
-            },
-            'type' => 'line_arg'
-          },
-          {
-            'type' => 'line_arg'
-          },
-          {
-            'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'Third node unnumbered'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'Third-node-unnumbered'
+                },
+                'type' => 'line_arg'
               },
-              'normalized' => 'Top'
-            },
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+              {
+                'type' => 'line_arg'
+              },
+              {
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'Top'
+                },
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'node',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -1961,24 +2050,27 @@ $result_trees{'complex'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2012,23 +2104,28 @@ $result_trees{'complex'} = [
     },
     'unit_contents' => [
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Third node unnumbered'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Third node unnumbered'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'Third-node-unnumbered'
@@ -2049,24 +2146,27 @@ $result_trees{'complex'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered continuity'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered continuity'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2104,84 +2204,89 @@ $result_trees{'complex'} = [
     },
     'unit_contents' => [
       {
-        'args' => [
-          {
-            'contents' => [
-              {
-                'text' => 'continuity'
-              }
-            ],
-            'type' => 'line_arg'
-          },
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Third node unnumbered'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'continuity'
+                  }
+                ],
+                'type' => 'line_arg'
               },
-              'normalized' => 'Third-node-unnumbered'
-            },
-            'info' => {
-              'spaces_before_argument' => {
-                'text' => '  '
-              }
-            },
-            'type' => 'line_arg'
-          },
-          {
-            'contents' => [
               {
-                'text' => 'Last node no description'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'Third node unnumbered'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'Third-node-unnumbered'
+                },
+                'info' => {
+                  'spaces_before_argument' => {
+                    'text' => '  '
+                  }
+                },
+                'type' => 'line_arg'
               },
-              'normalized' => 'Last-node-no-description'
-            },
-            'info' => {
-              'spaces_before_argument' => {
-                'text' => ' '
-              }
-            },
-            'type' => 'line_arg'
-          },
-          {
-            'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'Last node no description'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'Last-node-no-description'
+                },
+                'info' => {
+                  'spaces_before_argument' => {
+                    'text' => ' '
+                  }
+                },
+                'type' => 'line_arg'
               },
-              'normalized' => 'Top'
-            },
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+              {
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'Top'
+                },
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
-              },
-              'spaces_before_argument' => {
-                'text' => ' '
+                  },
+                  'spaces_before_argument' => {
+                    'text' => ' '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'continuity'
@@ -2198,59 +2303,62 @@ $result_trees{'complex'} = [
       },
       {},
       {
-        'args' => [
-          {
-            'contents' => [
-              {
-                'text' => 'Last node no description'
-              }
-            ],
-            'type' => 'line_arg'
-          },
-          {
-            'type' => 'line_arg'
-          },
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'continuity'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'Last node no description'
+                  }
+                ],
+                'type' => 'line_arg'
+              },
+              {
+                'type' => 'line_arg'
               },
-              'normalized' => 'continuity'
-            },
-            'type' => 'line_arg'
-          },
-          {
-            'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'continuity'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'continuity'
+                },
+                'type' => 'line_arg'
               },
-              'normalized' => 'Top'
-            },
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+              {
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'Top'
+                },
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'node',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -2300,45 +2408,45 @@ $result_trees{'complex'} = [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'complex'}[0]{'unit_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[0]{'unit_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex'}[0]{'unit_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[0]{'unit_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex'}[0]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[0]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex'}[0]{'unit_command'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[0]{'unit_command'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex'}[0]{'unit_command'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[0]{'unit_command'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex'}[0]{'unit_command'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[0]{'unit_command'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex'}[0]{'unit_contents'}[1]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'complex'}[0]{'unit_contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'complex'}[0]{'unit_contents'}[1]{'args'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = $result_trees{'complex'}[0]{'unit_contents'}[1]{'args'}[2]{'contents'}[1];
+$result_trees{'complex'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[0]{'unit_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[0]{'unit_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[0]{'unit_command'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[0]{'unit_command'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[0]{'unit_command'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[0]{'unit_command'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[0]{'unit_command'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[0]{'unit_command'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[0]{'unit_command'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[0]{'unit_command'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[0]{'unit_contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[0]{'unit_contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[0]{'unit_contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[0]{'unit_contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[1];
 $result_trees{'complex'}[0]{'unit_contents'}[2] = 
$result_trees{'complex'}[0]{'unit_command'};
-$result_trees{'complex'}[1]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[1]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex'}[1]{'unit_command'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[1]{'unit_command'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex'}[1]{'unit_command'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[1]{'unit_command'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex'}[1]{'unit_contents'}[0]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'complex'}[1]{'unit_contents'}[0]{'args'}[2]{'contents'}[0];
-$result_trees{'complex'}[1]{'unit_contents'}[0]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'complex'}[1]{'unit_contents'}[0]{'args'}[3]{'contents'}[0];
+$result_trees{'complex'}[1]{'unit_command'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[1]{'unit_command'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[1]{'unit_command'}{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[1]{'unit_command'}{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[1]{'unit_command'}{'contents'}[3]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[1]{'unit_command'}{'contents'}[3]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[1]{'unit_contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[1]{'unit_contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'complex'}[1]{'unit_contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[1]{'unit_contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'complex'}[1]{'unit_contents'}[1] = 
$result_trees{'complex'}[1]{'unit_command'};
-$result_trees{'complex'}[2]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[2]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex'}[2]{'unit_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[2]{'unit_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex'}[2]{'unit_command'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[2]{'unit_command'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex'}[2]{'unit_command'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[2]{'unit_command'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[2]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[2]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[2]{'unit_command'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[2]{'unit_command'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[2]{'unit_command'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[2]{'unit_command'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[2]{'unit_command'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[2]{'unit_command'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0];
 $result_trees{'complex'}[2]{'unit_contents'}[1] = 
$result_trees{'complex'}[2]{'unit_command'};
 $result_trees{'complex'}[3]{'unit_contents'}[1] = 
$result_trees{'complex'}[3]{'unit_command'};
 $result_trees{'complex'}[4]{'unit_contents'}[1] = 
$result_trees{'complex'}[4]{'unit_command'};
 $result_trees{'complex'}[5]{'unit_contents'}[1] = 
$result_trees{'complex'}[5]{'unit_command'};
 $result_trees{'complex'}[6]{'unit_contents'}[1] = 
$result_trees{'complex'}[6]{'unit_command'};
-$result_trees{'complex'}[7]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[7]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[7]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[7]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 $result_trees{'complex'}[7]{'unit_contents'}[1] = 
$result_trees{'complex'}[7]{'unit_command'};
 $result_trees{'complex'}[8]{'unit_contents'}[1] = 
$result_trees{'complex'}[8]{'unit_command'};
 $result_trees{'complex'}[9]{'unit_contents'}[1] = 
$result_trees{'complex'}[9]{'unit_command'};
-$result_trees{'complex'}[9]{'unit_contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'complex'}[9]{'unit_contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'complex'}[10]{'unit_contents'}[0]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'complex'}[10]{'unit_contents'}[0]{'args'}[1]{'contents'}[0];
-$result_trees{'complex'}[10]{'unit_contents'}[0]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'complex'}[10]{'unit_contents'}[0]{'args'}[3]{'contents'}[0];
+$result_trees{'complex'}[9]{'unit_contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[9]{'unit_contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'complex'}[10]{'unit_contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[10]{'unit_contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[10]{'unit_contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[10]{'unit_contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'complex'}[10]{'unit_contents'}[1] = 
$result_trees{'complex'}[10]{'unit_command'};
 $result_trees{'complex'}[11]{'unit_contents'}[1] = 
$result_trees{'complex'}[11]{'unit_command'};
-$result_trees{'complex'}[12]{'unit_contents'}[0]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'complex'}[12]{'unit_contents'}[0]{'args'}[1]{'contents'}[0];
-$result_trees{'complex'}[12]{'unit_contents'}[0]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'complex'}[12]{'unit_contents'}[0]{'args'}[2]{'contents'}[0];
-$result_trees{'complex'}[12]{'unit_contents'}[0]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'complex'}[12]{'unit_contents'}[0]{'args'}[3]{'contents'}[0];
+$result_trees{'complex'}[12]{'unit_contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[12]{'unit_contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex'}[12]{'unit_contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[12]{'unit_contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'complex'}[12]{'unit_contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[12]{'unit_contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'complex'}[12]{'unit_contents'}[1] = 
$result_trees{'complex'}[12]{'unit_command'};
-$result_trees{'complex'}[12]{'unit_contents'}[2]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'complex'}[12]{'unit_contents'}[2]{'args'}[2]{'contents'}[0];
-$result_trees{'complex'}[12]{'unit_contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'complex'}[12]{'unit_contents'}[2]{'args'}[3]{'contents'}[0];
+$result_trees{'complex'}[12]{'unit_contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[12]{'unit_contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'complex'}[12]{'unit_contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex'}[12]{'unit_contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'complex'} = '@node Top,First node,(dir)
 @top
diff --git a/tp/t/results/moresectioning/complex_split_at_node.pl 
b/tp/t/results/moresectioning/complex_split_at_node.pl
index fb50ccd20c..a428f1c0b6 100644
--- a/tp/t/results/moresectioning/complex_split_at_node.pl
+++ b/tp/t/results/moresectioning/complex_split_at_node.pl
@@ -8,60 +8,65 @@ use utf8;
 $result_trees{'complex_split_at_node'} = [
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'Top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'First node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
-            },
-            'normalized' => 'First-node'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'type' => 'line_arg'
             },
             {
-              'text' => 'dir'
+              'contents' => [
+                {
+                  'text' => 'First node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'First-node'
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -87,19 +92,22 @@ $result_trees{'complex_split_at_node'} = [
       },
       {},
       {
-        'args' => [
+        'cmdname' => 'top',
+        'contents' => [
           {
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+            'contents' => [
+              {
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'top',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'cmdname' => 'menu',
             'contents' => [
@@ -453,58 +461,63 @@ $result_trees{'complex_split_at_node'} = [
   },
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'First node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'First node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'First-node'
@@ -522,24 +535,27 @@ $result_trees{'complex_split_at_node'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'chapter',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'first node chapter'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'first node chapter'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'chapter',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -788,23 +804,28 @@ $result_trees{'complex_split_at_node'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumbered'
@@ -822,24 +843,27 @@ $result_trees{'complex_split_at_node'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'unnumberedsec',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'unnumbered section'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'unnumbered section'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'unnumberedsec',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -1109,23 +1133,28 @@ $result_trees{'complex_split_at_node'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered sub'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered sub'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumbered-sub'
@@ -1143,24 +1172,27 @@ $result_trees{'complex_split_at_node'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'unnumberedsubsec',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'unnumbered subsection'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'unnumbered subsection'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'unnumberedsubsec',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -1183,23 +1215,28 @@ $result_trees{'complex_split_at_node'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered sub'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered sub'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'numbered-sub'
@@ -1217,24 +1254,27 @@ $result_trees{'complex_split_at_node'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'subsection',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'numbered subsection'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'numbered subsection'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'subsection',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -1257,23 +1297,28 @@ $result_trees{'complex_split_at_node'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered sub2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered sub2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumbered-sub2'
@@ -1291,24 +1336,27 @@ $result_trees{'complex_split_at_node'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'unnumberedsubsec',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'unnumbered subsection2'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'unnumbered subsection2'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'unnumberedsubsec',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -1331,23 +1379,28 @@ $result_trees{'complex_split_at_node'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered sub2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered sub2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'numbered-sub2'
@@ -1365,24 +1418,27 @@ $result_trees{'complex_split_at_node'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'subsection',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'numbered subsection2'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'numbered subsection2'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'subsection',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -1405,23 +1461,28 @@ $result_trees{'complex_split_at_node'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumbered2'
@@ -1439,24 +1500,27 @@ $result_trees{'complex_split_at_node'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'unnumberedsec',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'unnumbered section2'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'unnumbered section2'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'unnumberedsec',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -1585,23 +1649,28 @@ $result_trees{'complex_split_at_node'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered sub3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered sub3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'numbered-sub3'
@@ -1619,24 +1688,27 @@ $result_trees{'complex_split_at_node'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'subsection',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'numbered subsection3'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'numbered subsection3'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'subsection',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -1664,23 +1736,28 @@ $result_trees{'complex_split_at_node'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'numbered'
@@ -1698,24 +1775,27 @@ $result_trees{'complex_split_at_node'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'section',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'numbered section'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'numbered section'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'section',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -1740,46 +1820,49 @@ $result_trees{'complex_split_at_node'} = [
   },
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'between node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'between node'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1821,59 +1904,62 @@ $result_trees{'complex_split_at_node'} = [
   },
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'Second node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Third node unnumbered'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Second node'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'Third-node-unnumbered'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Third node unnumbered'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Third-node-unnumbered'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1911,24 +1997,27 @@ $result_trees{'complex_split_at_node'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'chapter',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'second node chapter'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'second node chapter'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'chapter',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -1967,23 +2056,28 @@ $result_trees{'complex_split_at_node'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Third node unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Third node unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Third-node-unnumbered'
@@ -2001,24 +2095,27 @@ $result_trees{'complex_split_at_node'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'unnumbered',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'unnumbered chapter'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'unnumbered chapter'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'unnumbered',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -2055,84 +2152,89 @@ $result_trees{'complex_split_at_node'} = [
   },
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'continuity'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Third node unnumbered'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'continuity'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'Third-node-unnumbered'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => '  '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Last node no description'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Third node unnumbered'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Third-node-unnumbered'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => '  '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Last-node-no-description'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Last node no description'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Last-node-no-description'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'continuity'
@@ -2150,24 +2252,27 @@ $result_trees{'complex_split_at_node'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'unnumbered',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'unnumbered continuity'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'unnumbered continuity'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'unnumbered',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -2208,59 +2313,62 @@ $result_trees{'complex_split_at_node'} = [
   },
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'Last node no description'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'continuity'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Last node no description'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'continuity'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'continuity'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'continuity'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2312,46 +2420,46 @@ $result_trees{'complex_split_at_node'} = [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'complex_split_at_node'}[0]{'unit_command'}{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'unit_command'}{'args'}[1]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[0]{'unit_command'}{'args'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'unit_command'}{'args'}[2]{'contents'}[1];
+$result_trees{'complex_split_at_node'}[0]{'unit_command'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'unit_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[0]{'unit_command'}{'contents'}[0]{'contents'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'unit_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 $result_trees{'complex_split_at_node'}[0]{'unit_contents'}[1] = 
$result_trees{'complex_split_at_node'}[0]{'unit_command'};
-$result_trees{'complex_split_at_node'}[0]{'unit_contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'unit_contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[0]{'unit_contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'unit_contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[0]{'unit_contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'unit_contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[0]{'unit_contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'unit_contents'}[2]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[0]{'unit_contents'}[2]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'unit_contents'}[2]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[0]{'unit_contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'unit_contents'}[2]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[1]{'unit_command'}{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[1]{'unit_command'}{'args'}[2]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[1]{'unit_command'}{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[1]{'unit_command'}{'args'}[3]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[0]{'unit_contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'unit_contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[0]{'unit_contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'unit_contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[0]{'unit_contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'unit_contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[0]{'unit_contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'unit_contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[0]{'unit_contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'unit_contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[0]{'unit_contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[0]{'unit_contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[1]{'unit_command'}{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[1]{'unit_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[1]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[1]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[1]{'unit_contents'}[0] = 
$result_trees{'complex_split_at_node'}[1]{'unit_command'};
-$result_trees{'complex_split_at_node'}[1]{'unit_contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[1]{'unit_contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[1]{'unit_contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[1]{'unit_contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[1]{'unit_contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[1]{'unit_contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[1]{'unit_contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[1]{'unit_contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[1]{'unit_contents'}[1]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[1]{'unit_contents'}[1]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[1]{'unit_contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[1]{'unit_contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[2]{'unit_contents'}[0] = 
$result_trees{'complex_split_at_node'}[2]{'unit_command'};
-$result_trees{'complex_split_at_node'}[2]{'unit_contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[2]{'unit_contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[2]{'unit_contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[2]{'unit_contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[2]{'unit_contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[2]{'unit_contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[2]{'unit_contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[2]{'unit_contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[2]{'unit_contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[2]{'unit_contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[2]{'unit_contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[2]{'unit_contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[2]{'unit_contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[2]{'unit_contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[2]{'unit_contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[2]{'unit_contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[3]{'unit_contents'}[0] = 
$result_trees{'complex_split_at_node'}[3]{'unit_command'};
 $result_trees{'complex_split_at_node'}[4]{'unit_contents'}[0] = 
$result_trees{'complex_split_at_node'}[4]{'unit_command'};
 $result_trees{'complex_split_at_node'}[5]{'unit_contents'}[0] = 
$result_trees{'complex_split_at_node'}[5]{'unit_command'};
 $result_trees{'complex_split_at_node'}[6]{'unit_contents'}[0] = 
$result_trees{'complex_split_at_node'}[6]{'unit_command'};
 $result_trees{'complex_split_at_node'}[7]{'unit_contents'}[0] = 
$result_trees{'complex_split_at_node'}[7]{'unit_command'};
-$result_trees{'complex_split_at_node'}[7]{'unit_contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[7]{'unit_contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[7]{'unit_contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[7]{'unit_contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[8]{'unit_contents'}[0] = 
$result_trees{'complex_split_at_node'}[8]{'unit_command'};
 $result_trees{'complex_split_at_node'}[9]{'unit_contents'}[0] = 
$result_trees{'complex_split_at_node'}[9]{'unit_command'};
-$result_trees{'complex_split_at_node'}[10]{'unit_command'}{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[10]{'unit_command'}{'args'}[3]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[10]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[10]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[10]{'unit_contents'}[0] = 
$result_trees{'complex_split_at_node'}[10]{'unit_command'};
-$result_trees{'complex_split_at_node'}[11]{'unit_command'}{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[11]{'unit_command'}{'args'}[1]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[11]{'unit_command'}{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[11]{'unit_command'}{'args'}[3]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[11]{'unit_command'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[11]{'unit_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[11]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[11]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[11]{'unit_contents'}[0] = 
$result_trees{'complex_split_at_node'}[11]{'unit_command'};
 $result_trees{'complex_split_at_node'}[12]{'unit_contents'}[0] = 
$result_trees{'complex_split_at_node'}[12]{'unit_command'};
-$result_trees{'complex_split_at_node'}[13]{'unit_command'}{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[13]{'unit_command'}{'args'}[1]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[13]{'unit_command'}{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[13]{'unit_command'}{'args'}[2]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[13]{'unit_command'}{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[13]{'unit_command'}{'args'}[3]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[13]{'unit_command'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[13]{'unit_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[13]{'unit_command'}{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[13]{'unit_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[13]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[13]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[13]{'unit_contents'}[0] = 
$result_trees{'complex_split_at_node'}[13]{'unit_command'};
-$result_trees{'complex_split_at_node'}[14]{'unit_command'}{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[14]{'unit_command'}{'args'}[2]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[14]{'unit_command'}{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[14]{'unit_command'}{'args'}[3]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[14]{'unit_command'}{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[14]{'unit_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[14]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'complex_split_at_node'}[14]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[14]{'unit_contents'}[0] = 
$result_trees{'complex_split_at_node'}[14]{'unit_command'};
 
 $result_texis{'complex_split_at_node'} = '@node Top,First node,(dir)
diff --git a/tp/t/results/moresectioning/contents.pl 
b/tp/t/results/moresectioning/contents.pl
index 232d72121e..214d9e9755 100644
--- a/tp/t/results/moresectioning/contents.pl
+++ b/tp/t/results/moresectioning/contents.pl
@@ -16,24 +16,27 @@ $result_trees{'contents'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -51,24 +54,27 @@ $result_trees{'contents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -88,24 +94,27 @@ $result_trees{'contents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -125,24 +134,27 @@ $result_trees{'contents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -162,24 +174,27 @@ $result_trees{'contents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsubsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsubsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsubsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsubsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -199,24 +214,27 @@ $result_trees{'contents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -234,24 +252,27 @@ $result_trees{'contents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter in part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter in part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -272,24 +293,27 @@ $result_trees{'contents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second chapter in part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'second chapter in part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -309,24 +333,27 @@ $result_trees{'contents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -344,24 +371,27 @@ $result_trees{'contents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'appendix'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'appendix'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -381,24 +411,27 @@ $result_trees{'contents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendixsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'appendixsec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'appendixsec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendixsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/moresectioning/contents_and_shortcontents.pl 
b/tp/t/results/moresectioning/contents_and_shortcontents.pl
index 528380d2e5..95021c73ea 100644
--- a/tp/t/results/moresectioning/contents_and_shortcontents.pl
+++ b/tp/t/results/moresectioning/contents_and_shortcontents.pl
@@ -16,24 +16,27 @@ $result_trees{'contents_and_shortcontents'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -51,24 +54,27 @@ $result_trees{'contents_and_shortcontents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -88,24 +94,27 @@ $result_trees{'contents_and_shortcontents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -125,24 +134,27 @@ $result_trees{'contents_and_shortcontents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -162,24 +174,27 @@ $result_trees{'contents_and_shortcontents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsubsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsubsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsubsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsubsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -199,24 +214,27 @@ $result_trees{'contents_and_shortcontents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -234,24 +252,27 @@ $result_trees{'contents_and_shortcontents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter in part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter in part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -272,24 +293,27 @@ $result_trees{'contents_and_shortcontents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second chapter in part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'second chapter in part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -309,24 +333,27 @@ $result_trees{'contents_and_shortcontents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -344,24 +371,27 @@ $result_trees{'contents_and_shortcontents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'appendix'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'appendix'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -381,24 +411,27 @@ $result_trees{'contents_and_shortcontents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendixsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'appendixsec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'appendixsec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendixsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 b4cac01184..0e05a1d974 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
@@ -32,23 +32,28 @@ $result_trees{'contents_at_begin_chapter_without_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'contents_at_begin_chapter_without_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'contents at document begin'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'contents at document begin'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -98,23 +106,28 @@ $result_trees{'contents_at_begin_chapter_without_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
diff --git a/tp/t/results/moresectioning/contents_at_end_document.pl 
b/tp/t/results/moresectioning/contents_at_end_document.pl
index 97744031db..168611e66f 100644
--- a/tp/t/results/moresectioning/contents_at_end_document.pl
+++ b/tp/t/results/moresectioning/contents_at_end_document.pl
@@ -11,23 +11,28 @@ $result_trees{'contents_at_end_document'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'contents_at_end_document'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'contents at end document'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => ' 
+              'contents' => [
+                {
+                  'text' => 'contents at end document'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => ' 
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -77,24 +85,27 @@ $result_trees{'contents_at_end_document'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 bcdd8a649b..961dec7f50 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
@@ -11,23 +11,28 @@ $result_trees{'contents_at_end_document_after_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'contents_at_end_document_after_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'contents at end document after node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'contents at end document after node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -180,24 +188,27 @@ $result_trees{'contents_at_end_document_after_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -217,46 +228,49 @@ $result_trees{'contents_at_end_document_after_node'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'a node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'a node'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -293,8 +307,8 @@ $result_trees{'contents_at_end_document_after_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_at_end_document_after_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_at_end_document_after_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'contents_at_end_document_after_node'}{'contents'}[4]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_at_end_document_after_node'}{'contents'}[4]{'args'}[3]{'contents'}[0];
+$result_trees{'contents_at_end_document_after_node'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_at_end_document_after_node'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_at_end_document_after_node'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_at_end_document_after_node'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'contents_at_end_document_after_node'} = '@node Top
 @top contents at end document after node
diff --git a/tp/t/results/moresectioning/contents_in_document.pl 
b/tp/t/results/moresectioning/contents_in_document.pl
index e1e1504966..bba88603df 100644
--- a/tp/t/results/moresectioning/contents_in_document.pl
+++ b/tp/t/results/moresectioning/contents_in_document.pl
@@ -11,23 +11,28 @@ $result_trees{'contents_in_document'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'contents_in_document'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'contents in document'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'contents in document'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -96,23 +104,28 @@ $result_trees{'contents_in_document'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
diff --git a/tp/t/results/moresectioning/empty_top_node_up.pl 
b/tp/t/results/moresectioning/empty_top_node_up.pl
index 3d39f62b51..a4d4cac614 100644
--- a/tp/t/results/moresectioning/empty_top_node_up.pl
+++ b/tp/t/results/moresectioning/empty_top_node_up.pl
@@ -11,23 +11,28 @@ $result_trees{'empty_top_node_up'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'empty_top_node_up'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'empty top node up'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'empty top node up'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -180,23 +188,28 @@ $result_trees{'empty_top_node_up'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -213,7 +226,7 @@ $result_trees{'empty_top_node_up'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'empty_top_node_up'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'empty_top_node_up'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'empty_top_node_up'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'empty_top_node_up'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'empty_top_node_up'} = '@node Top
 @top empty top node up
diff --git a/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl 
b/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl
index 0038f1f30a..2591d5a920 100644
--- a/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl
+++ b/tp/t/results/moresectioning/equivalent_nodes_defined_linked.pl
@@ -11,56 +11,59 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'type' => 'line_arg'
+            },
             {
-              'cmdname' => 'asis',
               'contents' => [
                 {
+                  'cmdname' => 'asis',
                   'contents' => [
                     {
-                      'text' => 'chap'
+                      'contents' => [
+                        {
+                          'text' => 'chap'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 1
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 1
-              }
-            }
-          ],
-          'extra' => {
-            'node_content' => {
-              'contents' => [
-                {}
-              ]
-            },
-            'normalized' => 'chap'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'chap'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -197,24 +200,27 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -484,10 +490,10 @@ $result_trees{'equivalent_nodes_defined_linked'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'contents'}[0]{'contents'}[0];
+$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'contents'}[8]{'contents'}[7]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'contents'}[8]{'contents'}[7]{'contents'}[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 bca4c76dd5..600f19e10c 100644
--- a/tp/t/results/moresectioning/internal_top_node_up.pl
+++ b/tp/t/results/moresectioning/internal_top_node_up.pl
@@ -8,23 +8,28 @@ use utf8;
 $result_trees{'internal_top_node_up'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -44,24 +49,27 @@ $result_trees{'internal_top_node_up'} = [
       },
       {},
       {
-        'args' => [
+        'cmdname' => 'top',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'internal top node up'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'internal top node up'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'top',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -186,23 +194,28 @@ $result_trees{'internal_top_node_up'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -223,7 +236,7 @@ $result_trees{'internal_top_node_up'} = [
   }
 ];
 $result_trees{'internal_top_node_up'}[0]{'unit_contents'}[1] = 
$result_trees{'internal_top_node_up'}[0]{'unit_command'};
-$result_trees{'internal_top_node_up'}[0]{'unit_contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'internal_top_node_up'}[0]{'unit_contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'internal_top_node_up'}[0]{'unit_contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'internal_top_node_up'}[0]{'unit_contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 $result_trees{'internal_top_node_up'}[1]{'unit_contents'}[0] = 
$result_trees{'internal_top_node_up'}[1]{'unit_command'};
 
 $result_texis{'internal_top_node_up'} = '@node Top
diff --git a/tp/t/results/moresectioning/lowered_subsubsection.pl 
b/tp/t/results/moresectioning/lowered_subsubsection.pl
index 085327c115..1a0f86a6d2 100644
--- a/tp/t/results/moresectioning/lowered_subsubsection.pl
+++ b/tp/t/results/moresectioning/lowered_subsubsection.pl
@@ -11,23 +11,28 @@ $result_trees{'lowered_subsubsection'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,19 +47,22 @@ $result_trees{'lowered_subsubsection'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -170,23 +178,28 @@ $result_trees{'lowered_subsubsection'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Chapter'
@@ -201,24 +214,27 @@ $result_trees{'lowered_subsubsection'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -341,23 +357,28 @@ $result_trees{'lowered_subsubsection'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Section'
@@ -372,24 +393,27 @@ $result_trees{'lowered_subsubsection'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -512,23 +536,28 @@ $result_trees{'lowered_subsubsection'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Subsection'
@@ -543,24 +572,27 @@ $result_trees{'lowered_subsubsection'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -729,23 +761,28 @@ $result_trees{'lowered_subsubsection'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Subsubsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Subsubsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Subsubsection'
@@ -760,24 +797,27 @@ $result_trees{'lowered_subsubsection'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsubsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Subsubsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Subsubsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsubsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -807,23 +847,28 @@ $result_trees{'lowered_subsubsection'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Lowered subsec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Lowered subsec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Lowered-subsec'
@@ -838,24 +883,27 @@ $result_trees{'lowered_subsubsection'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Lowered subsec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Lowered subsec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -979,23 +1027,28 @@ $result_trees{'lowered_subsubsection'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Lowered subsubsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Lowered subsubsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Lowered-subsubsection'
@@ -1010,24 +1063,27 @@ $result_trees{'lowered_subsubsection'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsubsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Lowered subsubsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Lowered subsubsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsubsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -1084,12 +1140,12 @@ $result_trees{'lowered_subsubsection'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'lowered_subsubsection'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'lowered_subsubsection'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'lowered_subsubsection'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'lowered_subsubsection'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'lowered_subsubsection'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'lowered_subsubsection'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'lowered_subsubsection'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'lowered_subsubsection'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'lowered_subsubsection'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'lowered_subsubsection'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'lowered_subsubsection'}{'contents'}[8]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[8]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'lowered_subsubsection'}{'contents'}[12]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[12]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'lowered_subsubsection'} = '@node Top
 @top
diff --git a/tp/t/results/moresectioning/loweredheading.pl 
b/tp/t/results/moresectioning/loweredheading.pl
index 6a82851e2a..e63ac77745 100644
--- a/tp/t/results/moresectioning/loweredheading.pl
+++ b/tp/t/results/moresectioning/loweredheading.pl
@@ -23,24 +23,27 @@ $result_trees{'loweredheading'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Foo'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Foo'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
diff --git a/tp/t/results/moresectioning/more_sections_than_nodes.pl 
b/tp/t/results/moresectioning/more_sections_than_nodes.pl
index de60c4c18b..212b89d7a0 100644
--- a/tp/t/results/moresectioning/more_sections_than_nodes.pl
+++ b/tp/t/results/moresectioning/more_sections_than_nodes.pl
@@ -11,23 +11,28 @@ $result_trees{'more_sections_than_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'more_sections_than_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -272,24 +280,27 @@ $result_trees{'more_sections_than_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'c1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'c1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -309,23 +320,28 @@ $result_trees{'more_sections_than_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'n c2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'n c2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'n-c2'
@@ -340,24 +356,27 @@ $result_trees{'more_sections_than_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'c2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'c2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -377,24 +396,27 @@ $result_trees{'more_sections_than_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 's1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 's1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -414,84 +436,89 @@ $result_trees{'more_sections_than_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'n c3'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'n c3 s1 s2'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'n c3'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'n-c3-s1-s2'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'n c2'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'n c3 s1 s2'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'n-c3-s1-s2'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'n-c2'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'n c2'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'n-c2'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'n-c3'
@@ -506,24 +533,27 @@ $result_trees{'more_sections_than_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'c3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'c3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -646,24 +676,27 @@ $result_trees{'more_sections_than_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'C3 s1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'C3 s1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -683,23 +716,28 @@ $result_trees{'more_sections_than_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'n c3 s 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'n c3 s 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'n-c3-s-2'
@@ -714,24 +752,27 @@ $result_trees{'more_sections_than_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'c3 s2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'c3 s2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -751,24 +792,27 @@ $result_trees{'more_sections_than_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'c3 s3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'c3 s3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -788,24 +832,27 @@ $result_trees{'more_sections_than_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'c4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'c4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -825,24 +872,27 @@ $result_trees{'more_sections_than_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'c3 s1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'c3 s1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -862,24 +912,27 @@ $result_trees{'more_sections_than_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'c3 s1 s1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'c3 s1 s1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -899,58 +952,63 @@ $result_trees{'more_sections_than_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'n c3 s1 s2'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'n c3'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'n c3 s1 s2'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'n-c3'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'n c3'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'n-c3'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'n-c3-s1-s2'
@@ -965,24 +1023,27 @@ $result_trees{'more_sections_than_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'c3 s1 s2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'c3 s1 s2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1002,23 +1063,28 @@ $result_trees{'more_sections_than_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'appendix'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'appendix'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'appendix',
       'extra' => {
         'section_number' => 'A'
       },
@@ -1034,15 +1100,15 @@ $result_trees{'more_sections_than_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[1]{'contents'}[0];
-$result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[2]{'contents'}[0];
-$result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[7]{'args'}[3]{'contents'}[0];
-$result_trees{'more_sections_than_nodes'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'more_sections_than_nodes'}{'contents'}[16]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[16]{'args'}[2]{'contents'}[0];
-$result_trees{'more_sections_than_nodes'}{'contents'}[16]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[16]{'args'}[3]{'contents'}[0];
+$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'more_sections_than_nodes'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'more_sections_than_nodes'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'more_sections_than_nodes'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'more_sections_than_nodes'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'more_sections_than_nodes'}{'contents'}[16]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[16]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'more_sections_than_nodes'}{'contents'}[16]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[16]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'more_sections_than_nodes'} = '@node Top
 @top top
diff --git a/tp/t/results/moresectioning/more_sections_than_nodes_texi2html.pl 
b/tp/t/results/moresectioning/more_sections_than_nodes_texi2html.pl
index 0c0129d17d..4f76cc01af 100644
--- a/tp/t/results/moresectioning/more_sections_than_nodes_texi2html.pl
+++ b/tp/t/results/moresectioning/more_sections_than_nodes_texi2html.pl
@@ -16,23 +16,28 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -277,24 +285,27 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'c1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'c1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -314,23 +325,28 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'n c2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'n c2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'n-c2'
@@ -345,24 +361,27 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'c2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'c2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -382,24 +401,27 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 's1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 's1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -419,84 +441,89 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'n c3'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'n c3 s1 s2'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'n c3'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'n-c3-s1-s2'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'n c2'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'n c3 s1 s2'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'n-c3-s1-s2'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'n-c2'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'n c2'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'n-c2'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'n-c3'
@@ -511,24 +538,27 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'c3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'c3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -651,24 +681,27 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'C3 s1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'C3 s1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -688,23 +721,28 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'n c3 s 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'n c3 s 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'n-c3-s-2'
@@ -719,24 +757,27 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'c3 s2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'c3 s2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -756,24 +797,27 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'c3 s3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'c3 s3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -793,24 +837,27 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'c4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'c4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -830,24 +877,27 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'c3 s1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'c3 s1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -867,24 +917,27 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'c3 s1 s1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'c3 s1 s1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -904,58 +957,63 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'n c3 s1 s2'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'n c3'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'n c3 s1 s2'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'n-c3'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'n c3'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'n-c3'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'n-c3-s1-s2'
@@ -970,24 +1028,27 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'c3 s1 s2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'c3 s1 s2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1007,23 +1068,28 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'appendix'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'appendix'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'appendix',
       'extra' => {
         'section_number' => 'A'
       },
@@ -1039,15 +1105,15 @@ $result_trees{'more_sections_than_nodes_texi2html'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[7]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[7]{'args'}[1]{'contents'}[0];
-$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[7]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[7]{'args'}[2]{'contents'}[0];
-$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[7]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[7]{'args'}[3]{'contents'}[0];
-$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[16]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[16]{'args'}[2]{'contents'}[0];
-$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[16]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[16]{'args'}[3]{'contents'}[0];
+$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[16]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[16]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[16]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'more_sections_than_nodes_texi2html'}{'contents'}[16]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'more_sections_than_nodes_texi2html'} = '@node Top
 @top top
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 7df9dc1b4e..38f917a7bb 100644
--- a/tp/t/results/moresectioning/nodes_before_after_top_xref.pl
+++ b/tp/t/results/moresectioning/nodes_before_after_top_xref.pl
@@ -53,24 +53,27 @@ $result_trees{'nodes_before_after_top_xref'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node before'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node before'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -105,23 +108,28 @@ $result_trees{'nodes_before_after_top_xref'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -136,24 +144,27 @@ $result_trees{'nodes_before_after_top_xref'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top sectionning'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top sectionning'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -185,24 +196,27 @@ $result_trees{'nodes_before_after_top_xref'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'after'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'after'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -237,23 +251,28 @@ $result_trees{'nodes_before_after_top_xref'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -268,24 +287,27 @@ $result_trees{'nodes_before_after_top_xref'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -517,10 +539,10 @@ $result_trees{'nodes_before_after_top_xref'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_before_after_top_xref'}{'contents'}[6]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[6]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'nodes_before_after_top_xref'}{'contents'}[6]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[6]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'nodes_before_after_top_xref'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'nodes_before_after_top_xref'}{'contents'}[6]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[6]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'nodes_before_after_top_xref'}{'contents'}[6]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[6]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'nodes_before_after_top_xref'}{'contents'}[6]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[6]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'nodes_before_after_top_xref'}{'contents'}[6]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[6]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'nodes_before_after_top_xref'}{'contents'}[6]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_after_top_xref'}{'contents'}[6]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'nodes_before_after_top_xref'} = '@setfilename 
nodes_before_after_top_xref.info
 
diff --git 
a/tp/t/results/moresectioning/nodes_no_section_footnote_no_top_node_output.pl 
b/tp/t/results/moresectioning/nodes_no_section_footnote_no_top_node_output.pl
index bcdfa1f4f1..746053376a 100644
--- 
a/tp/t/results/moresectioning/nodes_no_section_footnote_no_top_node_output.pl
+++ 
b/tp/t/results/moresectioning/nodes_no_section_footnote_no_top_node_output.pl
@@ -16,23 +16,28 @@ 
$result_trees{'nodes_no_section_footnote_no_top_node_output'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ 
$result_trees{'nodes_no_section_footnote_no_top_node_output'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 e60619adbd..70eb2961fd 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
@@ -8,176 +8,181 @@ use utf8;
 $result_trees{'non_automatic_internal_top_node_up'} = [
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'Top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'chap'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'cmdname' => 'acronym',
               'contents' => [
                 {
+                  'text' => 'chap'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
                   'contents' => [
-                    {
-                      'text' => 'GNU'
-                    }
-                  ],
-                  'type' => 'brace_arg'
+                    {}
+                  ]
                 },
+                'normalized' => 'chap'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
                 {
+                  'cmdname' => 'acronym',
                   'contents' => [
                     {
-                      'cmdname' => 'acronym',
                       'contents' => [
                         {
+                          'text' => 'GNU'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'cmdname' => 'acronym',
                           'contents' => [
                             {
-                              'text' => 'GNU'
+                              'contents' => [
+                                {
+                                  'text' => 'GNU'
+                                }
+                              ],
+                              'type' => 'brace_arg'
                             }
                           ],
-                          'type' => 'brace_arg'
+                          'source_info' => {
+                            'line_nr' => 1
+                          }
+                        },
+                        {
+                          'text' => '\'s Not Unix'
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 1
-                      }
-                    },
-                    {
-                      'text' => '\'s Not Unix'
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 1
+                  }
+                },
+                {
+                  'text' => ' manuals'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 1
-              }
-            },
-            {
-              'text' => ' manuals'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
-              'contents' => [
-                {},
-                {}
-              ]
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {},
+                    {}
+                  ]
+                },
+                'normalized' => 'GNU-manuals'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'GNU-manuals'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'cmdname' => 'acronym',
               'contents' => [
                 {
+                  'cmdname' => 'acronym',
                   'contents' => [
                     {
-                      'text' => 'GNU'
-                    }
-                  ],
-                  'type' => 'brace_arg'
-                },
-                {
-                  'contents' => [
+                      'contents' => [
+                        {
+                          'text' => 'GNU'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
                     {
-                      'cmdname' => 'acronym',
                       'contents' => [
                         {
+                          'cmdname' => 'acronym',
                           'contents' => [
                             {
-                              'text' => 'GNU'
+                              'contents' => [
+                                {
+                                  'text' => 'GNU'
+                                }
+                              ],
+                              'type' => 'brace_arg'
                             }
                           ],
-                          'type' => 'brace_arg'
+                          'source_info' => {
+                            'line_nr' => 1
+                          }
+                        },
+                        {
+                          'text' => '\'s Not Unix'
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 1
-                      }
-                    },
-                    {
-                      'text' => '\'s Not Unix'
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 1
+                  }
+                },
+                {
+                  'text' => ' manuals'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 1
-              }
-            },
-            {
-              'text' => ' manuals'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
-              'contents' => [
-                {},
-                {}
-              ]
-            },
-            'normalized' => 'GNU-manuals'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {},
+                    {}
+                  ]
+                },
+                'normalized' => 'GNU-manuals'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -197,24 +202,27 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
       },
       {},
       {
-        'args' => [
+        'cmdname' => 'top',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'internal top node up'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'internal top node up'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'top',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -339,117 +347,122 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
   },
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chap'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'cmdname' => 'acronym',
               'contents' => [
                 {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
                   'contents' => [
-                    {
-                      'text' => 'GNU'
-                    }
-                  ],
-                  'type' => 'brace_arg'
+                    {}
+                  ]
                 },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
                 {
+                  'cmdname' => 'acronym',
                   'contents' => [
                     {
-                      'cmdname' => 'acronym',
                       'contents' => [
                         {
+                          'text' => 'GNU'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'cmdname' => 'acronym',
                           'contents' => [
                             {
-                              'text' => 'GNU'
+                              'contents' => [
+                                {
+                                  'text' => 'GNU'
+                                }
+                              ],
+                              'type' => 'brace_arg'
                             }
                           ],
-                          'type' => 'brace_arg'
+                          'source_info' => {
+                            'line_nr' => 8
+                          }
+                        },
+                        {
+                          'text' => '\'s Not Unix'
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 8
-                      }
-                    },
-                    {
-                      'text' => '\'s Not Unix'
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 8
+                  }
+                },
+                {
+                  'text' => ' manuals'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 8
-              }
-            },
-            {
-              'text' => ' manuals'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
-              'contents' => [
-                {},
-                {}
-              ]
-            },
-            'normalized' => 'GNU-manuals'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {},
+                    {}
+                  ]
+                },
+                'normalized' => 'GNU-manuals'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -469,16 +482,16 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'non_automatic_internal_top_node_up'}[0]{'unit_command'}{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'unit_command'}{'args'}[1]{'contents'}[0];
-$result_trees{'non_automatic_internal_top_node_up'}[0]{'unit_command'}{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'unit_command'}{'args'}[2]{'contents'}[0];
-$result_trees{'non_automatic_internal_top_node_up'}[0]{'unit_command'}{'args'}[2]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'unit_command'}{'args'}[2]{'contents'}[1];
-$result_trees{'non_automatic_internal_top_node_up'}[0]{'unit_command'}{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'unit_command'}{'args'}[3]{'contents'}[0];
-$result_trees{'non_automatic_internal_top_node_up'}[0]{'unit_command'}{'args'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'unit_command'}{'args'}[3]{'contents'}[1];
+$result_trees{'non_automatic_internal_top_node_up'}[0]{'unit_command'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'unit_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'non_automatic_internal_top_node_up'}[0]{'unit_command'}{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'unit_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'non_automatic_internal_top_node_up'}[0]{'unit_command'}{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'unit_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'non_automatic_internal_top_node_up'}[0]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'non_automatic_internal_top_node_up'}[0]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 $result_trees{'non_automatic_internal_top_node_up'}[0]{'unit_contents'}[1] = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'unit_command'};
-$result_trees{'non_automatic_internal_top_node_up'}[0]{'unit_contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'unit_contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'non_automatic_internal_top_node_up'}[1]{'unit_command'}{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[1]{'unit_command'}{'args'}[2]{'contents'}[0];
-$result_trees{'non_automatic_internal_top_node_up'}[1]{'unit_command'}{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[1]{'unit_command'}{'args'}[3]{'contents'}[0];
-$result_trees{'non_automatic_internal_top_node_up'}[1]{'unit_command'}{'args'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[1]{'unit_command'}{'args'}[3]{'contents'}[1];
+$result_trees{'non_automatic_internal_top_node_up'}[0]{'unit_contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'unit_contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'non_automatic_internal_top_node_up'}[1]{'unit_command'}{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[1]{'unit_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'non_automatic_internal_top_node_up'}[1]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[1]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'non_automatic_internal_top_node_up'}[1]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[1]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 $result_trees{'non_automatic_internal_top_node_up'}[1]{'unit_contents'}[0] = 
$result_trees{'non_automatic_internal_top_node_up'}[1]{'unit_command'};
 
 $result_texis{'non_automatic_internal_top_node_up'} = '@node Top, chap, 
@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals, @acronym{GNU, 
@acronym{GNU}\'s Not Unix} manuals
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 ca941de75b..629e759f8d 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
@@ -8,176 +8,181 @@ use utf8;
 $result_trees{'non_automatic_top_node_up_and_url'} = [
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'Top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'chap'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'cmdname' => 'acronym',
               'contents' => [
                 {
+                  'text' => 'chap'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
                   'contents' => [
-                    {
-                      'text' => 'GNU'
-                    }
-                  ],
-                  'type' => 'brace_arg'
+                    {}
+                  ]
                 },
+                'normalized' => 'chap'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
                 {
+                  'cmdname' => 'acronym',
                   'contents' => [
                     {
-                      'cmdname' => 'acronym',
                       'contents' => [
                         {
+                          'text' => 'GNU'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'cmdname' => 'acronym',
                           'contents' => [
                             {
-                              'text' => 'GNU'
+                              'contents' => [
+                                {
+                                  'text' => 'GNU'
+                                }
+                              ],
+                              'type' => 'brace_arg'
                             }
                           ],
-                          'type' => 'brace_arg'
+                          'source_info' => {
+                            'line_nr' => 1
+                          }
+                        },
+                        {
+                          'text' => '\'s Not Unix'
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 1
-                      }
-                    },
-                    {
-                      'text' => '\'s Not Unix'
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 1
+                  }
+                },
+                {
+                  'text' => ' manuals'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 1
-              }
-            },
-            {
-              'text' => ' manuals'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
-              'contents' => [
-                {},
-                {}
-              ]
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {},
+                    {}
+                  ]
+                },
+                'normalized' => 'GNU-manuals'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'GNU-manuals'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'cmdname' => 'acronym',
               'contents' => [
                 {
+                  'cmdname' => 'acronym',
                   'contents' => [
                     {
-                      'text' => 'GNU'
-                    }
-                  ],
-                  'type' => 'brace_arg'
-                },
-                {
-                  'contents' => [
+                      'contents' => [
+                        {
+                          'text' => 'GNU'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
                     {
-                      'cmdname' => 'acronym',
                       'contents' => [
                         {
+                          'cmdname' => 'acronym',
                           'contents' => [
                             {
-                              'text' => 'GNU'
+                              'contents' => [
+                                {
+                                  'text' => 'GNU'
+                                }
+                              ],
+                              'type' => 'brace_arg'
                             }
                           ],
-                          'type' => 'brace_arg'
+                          'source_info' => {
+                            'line_nr' => 1
+                          }
+                        },
+                        {
+                          'text' => '\'s Not Unix'
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 1
-                      }
-                    },
-                    {
-                      'text' => '\'s Not Unix'
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 1
+                  }
+                },
+                {
+                  'text' => ' manuals'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 1
-              }
-            },
-            {
-              'text' => ' manuals'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
-              'contents' => [
-                {},
-                {}
-              ]
-            },
-            'normalized' => 'GNU-manuals'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {},
+                    {}
+                  ]
+                },
+                'normalized' => 'GNU-manuals'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -197,24 +202,27 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
       },
       {},
       {
-        'args' => [
+        'cmdname' => 'top',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'internal top node up'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'internal top node up'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'top',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -339,117 +347,122 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
   },
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chap'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'cmdname' => 'acronym',
               'contents' => [
                 {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
                   'contents' => [
-                    {
-                      'text' => 'GNU'
-                    }
-                  ],
-                  'type' => 'brace_arg'
+                    {}
+                  ]
                 },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
                 {
+                  'cmdname' => 'acronym',
                   'contents' => [
                     {
-                      'cmdname' => 'acronym',
                       'contents' => [
                         {
+                          'text' => 'GNU'
+                        }
+                      ],
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'cmdname' => 'acronym',
                           'contents' => [
                             {
-                              'text' => 'GNU'
+                              'contents' => [
+                                {
+                                  'text' => 'GNU'
+                                }
+                              ],
+                              'type' => 'brace_arg'
                             }
                           ],
-                          'type' => 'brace_arg'
+                          'source_info' => {
+                            'line_nr' => 8
+                          }
+                        },
+                        {
+                          'text' => '\'s Not Unix'
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 8
-                      }
-                    },
-                    {
-                      'text' => '\'s Not Unix'
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 8
+                  }
+                },
+                {
+                  'text' => ' manuals'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 8
-              }
-            },
-            {
-              'text' => ' manuals'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
-              'contents' => [
-                {},
-                {}
-              ]
-            },
-            'normalized' => 'GNU-manuals'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {},
+                    {}
+                  ]
+                },
+                'normalized' => 'GNU-manuals'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -469,16 +482,16 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'non_automatic_top_node_up_and_url'}[0]{'unit_command'}{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'unit_command'}{'args'}[1]{'contents'}[0];
-$result_trees{'non_automatic_top_node_up_and_url'}[0]{'unit_command'}{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'unit_command'}{'args'}[2]{'contents'}[0];
-$result_trees{'non_automatic_top_node_up_and_url'}[0]{'unit_command'}{'args'}[2]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'unit_command'}{'args'}[2]{'contents'}[1];
-$result_trees{'non_automatic_top_node_up_and_url'}[0]{'unit_command'}{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'unit_command'}{'args'}[3]{'contents'}[0];
-$result_trees{'non_automatic_top_node_up_and_url'}[0]{'unit_command'}{'args'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'unit_command'}{'args'}[3]{'contents'}[1];
+$result_trees{'non_automatic_top_node_up_and_url'}[0]{'unit_command'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'unit_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'non_automatic_top_node_up_and_url'}[0]{'unit_command'}{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'unit_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'non_automatic_top_node_up_and_url'}[0]{'unit_command'}{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'unit_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'non_automatic_top_node_up_and_url'}[0]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'non_automatic_top_node_up_and_url'}[0]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 $result_trees{'non_automatic_top_node_up_and_url'}[0]{'unit_contents'}[1] = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'unit_command'};
-$result_trees{'non_automatic_top_node_up_and_url'}[0]{'unit_contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'unit_contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'non_automatic_top_node_up_and_url'}[1]{'unit_command'}{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[1]{'unit_command'}{'args'}[2]{'contents'}[0];
-$result_trees{'non_automatic_top_node_up_and_url'}[1]{'unit_command'}{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[1]{'unit_command'}{'args'}[3]{'contents'}[0];
-$result_trees{'non_automatic_top_node_up_and_url'}[1]{'unit_command'}{'args'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[1]{'unit_command'}{'args'}[3]{'contents'}[1];
+$result_trees{'non_automatic_top_node_up_and_url'}[0]{'unit_contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'unit_contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'non_automatic_top_node_up_and_url'}[1]{'unit_command'}{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[1]{'unit_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'non_automatic_top_node_up_and_url'}[1]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[1]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'non_automatic_top_node_up_and_url'}[1]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[1]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 $result_trees{'non_automatic_top_node_up_and_url'}[1]{'unit_contents'}[0] = 
$result_trees{'non_automatic_top_node_up_and_url'}[1]{'unit_command'};
 
 $result_texis{'non_automatic_top_node_up_and_url'} = '@node Top, chap, 
@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals, @acronym{GNU, 
@acronym{GNU}\'s Not Unix} manuals
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 781d6d2b62..3733eb0912 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
@@ -8,94 +8,99 @@ use utf8;
 $result_trees{'non_automatic_top_node_up_url'} = [
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'Top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
-            },
-            'normalized' => 'chap'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
-            },
-            {
-              'text' => 'dir'
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'chap'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => 'dir'
+              'contents' => [
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -115,24 +120,27 @@ $result_trees{'non_automatic_top_node_up_url'} = [
       },
       {},
       {
-        'args' => [
+        'cmdname' => 'top',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'internal top node up'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'internal top node up'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'top',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -257,76 +265,81 @@ $result_trees{'non_automatic_top_node_up_url'} = [
   },
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chap'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => '('
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => 'dir'
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -346,13 +359,13 @@ $result_trees{'non_automatic_top_node_up_url'} = [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'non_automatic_top_node_up_url'}[0]{'unit_command'}{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_top_node_up_url'}[0]{'unit_command'}{'args'}[1]{'contents'}[0];
-$result_trees{'non_automatic_top_node_up_url'}[0]{'unit_command'}{'args'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_top_node_up_url'}[0]{'unit_command'}{'args'}[2]{'contents'}[1];
-$result_trees{'non_automatic_top_node_up_url'}[0]{'unit_command'}{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_top_node_up_url'}[0]{'unit_command'}{'args'}[3]{'contents'}[1];
+$result_trees{'non_automatic_top_node_up_url'}[0]{'unit_command'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_top_node_up_url'}[0]{'unit_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'non_automatic_top_node_up_url'}[0]{'unit_command'}{'contents'}[0]{'contents'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_top_node_up_url'}[0]{'unit_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'non_automatic_top_node_up_url'}[0]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_top_node_up_url'}[0]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 $result_trees{'non_automatic_top_node_up_url'}[0]{'unit_contents'}[1] = 
$result_trees{'non_automatic_top_node_up_url'}[0]{'unit_command'};
-$result_trees{'non_automatic_top_node_up_url'}[0]{'unit_contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_top_node_up_url'}[0]{'unit_contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'non_automatic_top_node_up_url'}[1]{'unit_command'}{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_top_node_up_url'}[1]{'unit_command'}{'args'}[2]{'contents'}[0];
-$result_trees{'non_automatic_top_node_up_url'}[1]{'unit_command'}{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_top_node_up_url'}[1]{'unit_command'}{'args'}[3]{'contents'}[1];
+$result_trees{'non_automatic_top_node_up_url'}[0]{'unit_contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_top_node_up_url'}[0]{'unit_contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'non_automatic_top_node_up_url'}[1]{'unit_command'}{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_top_node_up_url'}[1]{'unit_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'non_automatic_top_node_up_url'}[1]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'non_automatic_top_node_up_url'}[1]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 $result_trees{'non_automatic_top_node_up_url'}[1]{'unit_contents'}[0] = 
$result_trees{'non_automatic_top_node_up_url'}[1]{'unit_command'};
 
 $result_texis{'non_automatic_top_node_up_url'} = '@node Top, chap, (dir), (dir)
diff --git a/tp/t/results/moresectioning/only_special_spaces_node.pl 
b/tp/t/results/moresectioning/only_special_spaces_node.pl
index 8d8aa50ec1..eea7d199fe 100644
--- a/tp/t/results/moresectioning/only_special_spaces_node.pl
+++ b/tp/t/results/moresectioning/only_special_spaces_node.pl
@@ -25,22 +25,27 @@ $result_trees{'only_special_spaces_node'} = {
       "type" => "before_node_section"
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "Top"
+              "contents" => [
+                {
+                  "text" => "Top"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {
         "is_target" => 1,
         "normalized" => "Top"
@@ -56,23 +61,26 @@ $result_trees{'only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "top",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "top"
+              "contents" => [
+                {
+                  "text" => "top"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "top",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -90,22 +98,27 @@ $result_trees{'only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "\x{2000}\x{2001}\x{2002}"
+              "contents" => [
+                {
+                  "text" => "\x{2000}\x{2001}\x{2002}"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {
         "is_target" => 1,
         "normalized" => "_2002_2003_2002"
@@ -121,23 +134,26 @@ $result_trees{'only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "chapter",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "EN QUAD|\x{2000}| EM QUAD|\x{2001}| EN 
SPACE|\x{2002}|"
+              "contents" => [
+                {
+                  "text" => "EN QUAD|\x{2000}| EM QUAD|\x{2001}| EN 
SPACE|\x{2002}|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "chapter",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -157,17 +173,22 @@ $result_trees{'only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => " \t\f\13\n"
+          "contents" => [
+            {
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => " \t\f\13\n"
+                }
+              },
+              "type" => "line_arg"
             }
-          },
-          "type" => "line_arg"
+          ],
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {},
       "source_info" => {
         "file_name" => "only_special_spaces_node.texi",
@@ -175,23 +196,26 @@ $result_trees{'only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "chapter",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "CHARACTER TABULATION|\t| FORM FEED|\f| LINE 
TABULATION|\13|"
+              "contents" => [
+                {
+                  "text" => "CHARACTER TABULATION|\t| FORM FEED|\f| LINE 
TABULATION|\13|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "chapter",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -211,17 +235,22 @@ $result_trees{'only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => " \r\n"
+          "contents" => [
+            {
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => " \r\n"
+                }
+              },
+              "type" => "line_arg"
             }
-          },
-          "type" => "line_arg"
+          ],
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {},
       "source_info" => {
         "file_name" => "only_special_spaces_node.texi",
@@ -229,23 +258,26 @@ $result_trees{'only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "chapter",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "CARRIAGE RETURN|\r|"
+              "contents" => [
+                {
+                  "text" => "CARRIAGE RETURN|\r|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "chapter",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -265,22 +297,27 @@ $result_trees{'only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "\x{85}\x{a0}\x{1680}"
+              "contents" => [
+                {
+                  "text" => "\x{85}\x{a0}\x{1680}"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {
         "is_target" => 1,
         "normalized" => "_0085_00a0_1680"
@@ -296,23 +333,26 @@ $result_trees{'only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "chapter",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "NEXT LINE (NEL)|\x{85}| NO-BREAK SPACE|\x{a0}| OGHAM 
SPACE MARK|\x{1680}|"
+              "contents" => [
+                {
+                  "text" => "NEXT LINE (NEL)|\x{85}| NO-BREAK SPACE|\x{a0}| 
OGHAM SPACE MARK|\x{1680}|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "chapter",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -332,22 +372,27 @@ $result_trees{'only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "\x{180e}\x{2003}"
+              "contents" => [
+                {
+                  "text" => "\x{180e}\x{2003}"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {
         "is_target" => 1,
         "normalized" => "_180e_2003"
@@ -363,23 +408,26 @@ $result_trees{'only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "chapter",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "MONGOLIAN VOWEL SEPARATOR|\x{180e}| EM 
SPACE|\x{2003}|"
+              "contents" => [
+                {
+                  "text" => "MONGOLIAN VOWEL SEPARATOR|\x{180e}| EM 
SPACE|\x{2003}|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "chapter",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -399,22 +447,27 @@ $result_trees{'only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => 
"\x{2004}\x{2005}\x{2006}\x{2007}\x{2008}\x{2009}\x{200a}\x{202f}\x{205f}\x{3000}"
+              "contents" => [
+                {
+                  "text" => 
"\x{2004}\x{2005}\x{2006}\x{2007}\x{2008}\x{2009}\x{200a}\x{202f}\x{205f}\x{3000}"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {
         "is_target" => 1,
         "normalized" => "_2004_2005_2006_2007_2008_2009_200a_202f_205f_3000"
@@ -430,23 +483,26 @@ $result_trees{'only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "chapter",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "THREE-PER-EM SPACE|\x{2004}| FOUR-PER-EM 
SPACE|\x{2005}| SIX-PER-EM SPACE|\x{2006}| FIGURE SPACE|\x{2007}| PUNCTUATION 
SPACE|\x{2008}| THIN SPACE|\x{2009}| HAIR SPACE|\x{200a}| NARROW NO-BREAK 
SPACE|\x{202f}| MEDIUM MATHEMATICAL SPACE|\x{205f}| IDEOGRAPHIC SPACE|\x{3000}|"
+              "contents" => [
+                {
+                  "text" => "THREE-PER-EM SPACE|\x{2004}| FOUR-PER-EM 
SPACE|\x{2005}| SIX-PER-EM SPACE|\x{2006}| FIGURE SPACE|\x{2007}| PUNCTUATION 
SPACE|\x{2008}| THIN SPACE|\x{2009}| HAIR SPACE|\x{200a}| NARROW NO-BREAK 
SPACE|\x{202f}| MEDIUM MATHEMATICAL SPACE|\x{205f}| IDEOGRAPHIC SPACE|\x{3000}|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "chapter",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
diff --git a/tp/t/results/moresectioning/placed_things_before_element.pl 
b/tp/t/results/moresectioning/placed_things_before_element.pl
index 0c04b3e7de..06c3154943 100644
--- a/tp/t/results/moresectioning/placed_things_before_element.pl
+++ b/tp/t/results/moresectioning/placed_things_before_element.pl
@@ -508,24 +508,27 @@ $result_trees{'placed_things_before_element'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -631,8 +634,8 @@ 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[5]{'con
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'placed_things_before_element'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'placed_things_before_element'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'placed_things_before_element'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'placed_things_before_element'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'placed_things_before_element'} = '@anchor{An anchor}
 
diff --git 
a/tp/t/results/moresectioning/placed_things_before_element_no_use_node.pl 
b/tp/t/results/moresectioning/placed_things_before_element_no_use_node.pl
index 19bfcb4d63..33deadcb35 100644
--- a/tp/t/results/moresectioning/placed_things_before_element_no_use_node.pl
+++ b/tp/t/results/moresectioning/placed_things_before_element_no_use_node.pl
@@ -508,24 +508,27 @@ $result_trees{'placed_things_before_element_no_use_node'} 
= {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -631,8 +634,8 @@ 
$result_trees{'placed_things_before_element_no_use_node'}{'contents'}[0]{'conten
 
$result_trees{'placed_things_before_element_no_use_node'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element_no_use_node'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'placed_things_before_element_no_use_node'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element_no_use_node'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'placed_things_before_element_no_use_node'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element_no_use_node'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'placed_things_before_element_no_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element_no_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'placed_things_before_element_no_use_node'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element_no_use_node'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'placed_things_before_element_no_use_node'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element_no_use_node'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'placed_things_before_element_no_use_node'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_element_no_use_node'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'placed_things_before_element_no_use_node'} = '@anchor{An anchor}
 
diff --git a/tp/t/results/moresectioning/placed_things_before_node.pl 
b/tp/t/results/moresectioning/placed_things_before_node.pl
index 13b44674ee..1b5ab0ac6c 100644
--- a/tp/t/results/moresectioning/placed_things_before_node.pl
+++ b/tp/t/results/moresectioning/placed_things_before_node.pl
@@ -511,23 +511,28 @@ $result_trees{'placed_things_before_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -542,24 +547,27 @@ $result_trees{'placed_things_before_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -577,23 +585,28 @@ $result_trees{'placed_things_before_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -608,24 +621,27 @@ $result_trees{'placed_things_before_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -731,8 +747,8 @@ 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[6]{'conten
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'placed_things_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'placed_things_before_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'placed_things_before_node'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'placed_things_before_node'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'placed_things_before_node'} = '@anchor{An anchor}
 
diff --git a/tp/t/results/moresectioning/raiselowersections.pl 
b/tp/t/results/moresectioning/raiselowersections.pl
index dc588aac33..f0a728269d 100644
--- a/tp/t/results/moresectioning/raiselowersections.pl
+++ b/tp/t/results/moresectioning/raiselowersections.pl
@@ -36,23 +36,28 @@ $result_trees{'raiselowersections'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -67,19 +72,22 @@ $result_trees{'raiselowersections'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'menu',
           'contents' => [
@@ -236,23 +244,28 @@ $result_trees{'raiselowersections'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Chapter'
@@ -267,24 +280,27 @@ $result_trees{'raiselowersections'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -729,23 +745,28 @@ $result_trees{'raiselowersections'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter in included file'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter in included file'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Chapter-in-included-file'
@@ -761,24 +782,27 @@ $result_trees{'raiselowersections'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter in included file'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter in included file'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -906,23 +930,28 @@ $result_trees{'raiselowersections'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Section'
@@ -938,24 +967,27 @@ $result_trees{'raiselowersections'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1083,23 +1115,28 @@ $result_trees{'raiselowersections'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Subsection'
@@ -1115,24 +1152,27 @@ $result_trees{'raiselowersections'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'source_marks' => [
             {
@@ -1416,23 +1456,28 @@ $result_trees{'raiselowersections'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Second chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Second chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Second-chapter'
@@ -1447,24 +1492,27 @@ $result_trees{'raiselowersections'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Second chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Second chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1524,11 +1572,11 @@ $result_trees{'raiselowersections'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'raiselowersections'} = '\\input texinfo @c -*-texinfo-*-
 
diff --git a/tp/t/results/moresectioning/rec_nodes.pl 
b/tp/t/results/moresectioning/rec_nodes.pl
index 76810392d2..89571e52e4 100644
--- a/tp/t/results/moresectioning/rec_nodes.pl
+++ b/tp/t/results/moresectioning/rec_nodes.pl
@@ -11,24 +11,27 @@ $result_trees{'rec_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -207,59 +210,62 @@ $result_trees{'rec_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chap node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chap node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -429,46 +435,49 @@ $result_trees{'rec_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'other node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'other node'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'chap-node'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'chap node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'chap-node'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -592,46 +601,49 @@ $result_trees{'rec_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'node up node following second'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node following second'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'node up node following second'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'node-following-second'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'node following second'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'node-following-second'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'menu',
           'contents' => [
@@ -764,46 +776,49 @@ $result_trees{'rec_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'node following second'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node up node following second'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'node following second'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'node-up-node-following-second'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'node up node following second'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'node-up-node-following-second'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -933,18 +948,18 @@ $result_trees{'rec_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'rec_nodes'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'rec_nodes'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'rec_nodes'}{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'rec_nodes'}{'contents'}[2]{'args'}[2]{'contents'}[0];
-$result_trees{'rec_nodes'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'rec_nodes'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'rec_nodes'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'rec_nodes'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-$result_trees{'rec_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'rec_nodes'}{'contents'}[4]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'rec_nodes'}{'contents'}[4]{'args'}[3]{'contents'}[0];
-$result_trees{'rec_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'rec_nodes'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'rec_nodes'}{'contents'}[5]{'args'}[3]{'contents'}[0];
-$result_trees{'rec_nodes'}{'contents'}[5]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[5]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'rec_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'rec_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'rec_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'rec_nodes'}{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'rec_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'rec_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'rec_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'rec_nodes'}{'contents'}[5]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'rec_nodes'}{'contents'}[5]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'rec_nodes'} = '@node Top
 Top node
diff --git a/tp/t/results/moresectioning/section_in_unnumbered_info.pl 
b/tp/t/results/moresectioning/section_in_unnumbered_info.pl
index 46cbfc0e80..254c783825 100644
--- a/tp/t/results/moresectioning/section_in_unnumbered_info.pl
+++ b/tp/t/results/moresectioning/section_in_unnumbered_info.pl
@@ -26,23 +26,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -58,24 +63,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Test section in unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Test section in unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -422,23 +430,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -454,24 +467,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -598,23 +614,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section in chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section in chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section-in-chapter'
@@ -630,24 +651,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section in chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section in chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -668,23 +692,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumbered'
@@ -700,24 +729,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -842,23 +874,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section in unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section in unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section-in-unnumbered'
@@ -874,24 +911,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section in unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section in unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -910,23 +950,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-2'
@@ -942,24 +987,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1133,23 +1181,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumberedsec 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumberedsec 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumberedsec-2'
@@ -1165,24 +1218,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered section 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered section 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1448,23 +1504,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered sub 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered sub 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumbered-sub-2'
@@ -1480,24 +1541,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsubsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered subsection 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered subsection 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsubsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1516,23 +1580,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered sub 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered sub 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'numbered-sub-2'
@@ -1548,24 +1617,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered subsection 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered subsection 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1584,23 +1656,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered sub2 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered sub2 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumbered-sub2-2'
@@ -1616,24 +1693,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsubsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered subsection2 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered subsection2 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsubsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1652,23 +1732,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered sub2 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered sub2 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'numbered-sub2-2'
@@ -1684,24 +1769,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered subsection2 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered subsection2 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1720,23 +1808,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumberedsec 2-1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumberedsec 2-1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumberedsec-2_002d1'
@@ -1752,24 +1845,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumberedsec 2-1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumberedsec 2-1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1894,23 +1990,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered sub 2-1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered sub 2-1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'numbered-sub-2_002d1'
@@ -1926,24 +2027,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered subsection 2-1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered subsection 2-1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1967,23 +2071,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-3'
@@ -1999,24 +2108,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2331,23 +2443,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumberedsec 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumberedsec 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumberedsec-3'
@@ -2363,24 +2480,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered section 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered section 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2646,23 +2766,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered sub 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered sub 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumbered-sub-3'
@@ -2678,24 +2803,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsubsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered subsection 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered subsection 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsubsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2714,23 +2842,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered sub 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered sub 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'numbered-sub-3'
@@ -2746,24 +2879,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered subsection 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered subsection 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2782,23 +2918,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered sub2 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered sub2 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumbered-sub2-3'
@@ -2814,24 +2955,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsubsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered subsection2 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered subsection2 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsubsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2850,23 +2994,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered sub2 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered sub2 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'numbered-sub2-3'
@@ -2882,24 +3031,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered subsection2 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered subsection2 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2918,23 +3070,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section 3-1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section 3-1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section-3_002d1'
@@ -2950,24 +3107,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section 3-1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section 3-1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2988,23 +3148,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumberedsec 3-2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumberedsec 3-2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumberedsec-3_002d2'
@@ -3020,24 +3185,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumberedsec 3-2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumberedsec 3-2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3162,23 +3330,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered sub 3-2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered sub 3-2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'numbered-sub-3_002d2'
@@ -3194,24 +3367,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered subsection 3-2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered subsection 3-2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3230,23 +3406,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section 3-3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section 3-3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section-3_002d3'
@@ -3262,24 +3443,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section 3-3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section 3-3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3406,23 +3590,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection 3-3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection 3-3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'subsection-3_002d3'
@@ -3438,24 +3627,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection 3-3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection 3-3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3476,23 +3668,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumberedsec 3-4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumberedsec 3-4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumberedsec-3_002d4'
@@ -3508,24 +3705,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumberedsec 3-4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumberedsec 3-4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3650,23 +3850,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered sub 3-4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered sub 3-4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'numbered-sub-3_002d4'
@@ -3682,24 +3887,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered subsection 3-4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered subsection 3-4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3718,23 +3926,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered 4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered 4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumbered-4'
@@ -3750,24 +3963,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered  4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered  4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3892,23 +4108,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumberedsec 4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumberedsec 4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumberedsec-4'
@@ -3924,24 +4145,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered section 4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered section 4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -4207,23 +4431,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered sub 4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered sub 4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumbered-sub-4'
@@ -4239,24 +4468,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsubsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered subsection 4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered subsection 4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsubsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -4275,23 +4507,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered sub 4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered sub 4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'numbered-sub-4'
@@ -4307,24 +4544,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered subsection 4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered subsection 4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -4343,23 +4583,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered sub2 4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered sub2 4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumbered-sub2-4'
@@ -4375,24 +4620,27 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsubsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered subsection2 4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered subsection2 4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsubsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -4411,23 +4659,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered sub2 4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered sub2 4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'numbered-sub2-4'
@@ -4443,23 +4696,28 @@ $result_trees{'section_in_unnumbered_info'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered subsection2 4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered subsection2 4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'subsection',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
@@ -4474,37 +4732,37 @@ $result_trees{'section_in_unnumbered_info'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[12]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[12]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[24]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[24]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[42]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[42]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[46]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[46]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[50]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[50]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[54]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[54]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[6]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[6]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[6]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[6]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[6]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[6]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[12]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[12]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[12]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[12]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[24]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[24]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[42]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[42]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[46]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[46]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[50]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[50]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[54]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[54]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'section_in_unnumbered_info'} = '
 @node Top
diff --git a/tp/t/results/moresectioning/section_in_unnumbered_plaintext.pl 
b/tp/t/results/moresectioning/section_in_unnumbered_plaintext.pl
index 5907ce43bb..6fbdf66f4f 100644
--- a/tp/t/results/moresectioning/section_in_unnumbered_plaintext.pl
+++ b/tp/t/results/moresectioning/section_in_unnumbered_plaintext.pl
@@ -26,23 +26,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -58,24 +63,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Test section in unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Test section in unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -422,23 +430,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -454,24 +467,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -598,23 +614,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section in chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section in chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section-in-chapter'
@@ -630,24 +651,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section in chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section in chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -668,23 +692,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumbered'
@@ -700,24 +729,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -842,23 +874,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section in unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section in unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section-in-unnumbered'
@@ -874,24 +911,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section in unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section in unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -910,23 +950,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-2'
@@ -942,24 +987,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1133,23 +1181,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumberedsec 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumberedsec 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumberedsec-2'
@@ -1165,24 +1218,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered section 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered section 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1448,23 +1504,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered sub 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered sub 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumbered-sub-2'
@@ -1480,24 +1541,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsubsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered subsection 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered subsection 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsubsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1516,23 +1580,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered sub 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered sub 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'numbered-sub-2'
@@ -1548,24 +1617,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered subsection 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered subsection 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1584,23 +1656,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered sub2 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered sub2 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumbered-sub2-2'
@@ -1616,24 +1693,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsubsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered subsection2 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered subsection2 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsubsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1652,23 +1732,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered sub2 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered sub2 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'numbered-sub2-2'
@@ -1684,24 +1769,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered subsection2 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered subsection2 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1720,23 +1808,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumberedsec 2-1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumberedsec 2-1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumberedsec-2_002d1'
@@ -1752,24 +1845,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumberedsec 2-1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumberedsec 2-1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1894,23 +1990,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered sub 2-1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered sub 2-1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'numbered-sub-2_002d1'
@@ -1926,24 +2027,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered subsection 2-1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered subsection 2-1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1967,23 +2071,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-3'
@@ -1999,24 +2108,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2331,23 +2443,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumberedsec 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumberedsec 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumberedsec-3'
@@ -2363,24 +2480,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered section 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered section 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2646,23 +2766,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered sub 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered sub 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumbered-sub-3'
@@ -2678,24 +2803,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsubsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered subsection 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered subsection 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsubsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2714,23 +2842,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered sub 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered sub 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'numbered-sub-3'
@@ -2746,24 +2879,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered subsection 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered subsection 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2782,23 +2918,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered sub2 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered sub2 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumbered-sub2-3'
@@ -2814,24 +2955,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsubsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered subsection2 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered subsection2 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsubsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2850,23 +2994,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered sub2 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered sub2 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'numbered-sub2-3'
@@ -2882,24 +3031,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered subsection2 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered subsection2 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2918,23 +3070,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section 3-1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section 3-1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section-3_002d1'
@@ -2950,24 +3107,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section 3-1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section 3-1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2988,23 +3148,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumberedsec 3-2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumberedsec 3-2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumberedsec-3_002d2'
@@ -3020,24 +3185,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumberedsec 3-2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumberedsec 3-2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3162,23 +3330,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered sub 3-2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered sub 3-2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'numbered-sub-3_002d2'
@@ -3194,24 +3367,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered subsection 3-2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered subsection 3-2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3230,23 +3406,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section 3-3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section 3-3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section-3_002d3'
@@ -3262,24 +3443,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section 3-3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section 3-3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3406,23 +3590,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection 3-3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection 3-3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'subsection-3_002d3'
@@ -3438,24 +3627,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection 3-3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection 3-3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3476,23 +3668,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumberedsec 3-4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumberedsec 3-4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumberedsec-3_002d4'
@@ -3508,24 +3705,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumberedsec 3-4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumberedsec 3-4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3650,23 +3850,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered sub 3-4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered sub 3-4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'numbered-sub-3_002d4'
@@ -3682,24 +3887,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered subsection 3-4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered subsection 3-4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3718,23 +3926,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered 4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered 4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumbered-4'
@@ -3750,24 +3963,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered  4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered  4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -3892,23 +4108,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumberedsec 4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumberedsec 4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumberedsec-4'
@@ -3924,24 +4145,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered section 4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered section 4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -4207,23 +4431,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered sub 4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered sub 4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumbered-sub-4'
@@ -4239,24 +4468,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsubsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered subsection 4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered subsection 4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsubsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -4275,23 +4507,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered sub 4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered sub 4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'numbered-sub-4'
@@ -4307,24 +4544,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered subsection 4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered subsection 4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -4343,23 +4583,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered sub2 4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered sub2 4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'unnumbered-sub2-4'
@@ -4375,24 +4620,27 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumberedsubsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered subsection2 4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered subsection2 4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumberedsubsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -4411,23 +4659,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered sub2 4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered sub2 4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'numbered-sub2-4'
@@ -4443,23 +4696,28 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'numbered subsection2 4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'numbered subsection2 4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'subsection',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
@@ -4474,37 +4732,37 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[12]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[12]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[24]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[24]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[42]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[42]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[46]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[46]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[50]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[50]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[54]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[54]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[6]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[6]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[6]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[6]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[6]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[6]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[12]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[12]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[12]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[12]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[24]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[24]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[42]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[42]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[46]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[46]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[50]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[50]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[54]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[54]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'section_in_unnumbered_plaintext'} = '
 @node Top
diff --git a/tp/t/results/moresectioning/sectioning_part_appendix.pl 
b/tp/t/results/moresectioning/sectioning_part_appendix.pl
index 424088b975..61462cdb3c 100644
--- a/tp/t/results/moresectioning/sectioning_part_appendix.pl
+++ b/tp/t/results/moresectioning/sectioning_part_appendix.pl
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'sectioning_part_appendix'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -52,24 +55,27 @@ $result_trees{'sectioning_part_appendix'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -95,24 +101,27 @@ $result_trees{'sectioning_part_appendix'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -138,24 +147,27 @@ $result_trees{'sectioning_part_appendix'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -181,24 +193,27 @@ $result_trees{'sectioning_part_appendix'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'subsubsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsubsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsubsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsubsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -224,37 +239,14 @@ $result_trees{'sectioning_part_appendix'} = [
   },
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chapter in part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
       'cmdname' => 'chapter',
       'contents' => [
         {
-          'text' => '
-',
-          'type' => 'empty_line'
-        }
-      ],
-      'extra' => {
-        'associated_part' => {
-          'args' => [
+          'contents' => [
             {
               'contents' => [
                 {
-                  'text' => 'part'
+                  'text' => 'chapter in part'
                 }
               ],
               'info' => {
@@ -266,8 +258,37 @@ $result_trees{'sectioning_part_appendix'} = [
               'type' => 'line_arg'
             }
           ],
+          'type' => 'argument'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        }
+      ],
+      'extra' => {
+        'associated_part' => {
           'cmdname' => 'part',
           'contents' => [
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'text' => 'part'
+                    }
+                  ],
+                  'info' => {
+                    'spaces_after_argument' => {
+                      'text' => '
+'
+                    }
+                  },
+                  'type' => 'line_arg'
+                }
+              ],
+              'type' => 'argument'
+            },
             {
               'text' => '
 ',
@@ -303,24 +324,27 @@ $result_trees{'sectioning_part_appendix'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second chapter in part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'second chapter in part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -346,24 +370,27 @@ $result_trees{'sectioning_part_appendix'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -387,24 +414,27 @@ $result_trees{'sectioning_part_appendix'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'appendix'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'appendix'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -430,23 +460,28 @@ $result_trees{'sectioning_part_appendix'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'appendixsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'appendixsec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'appendixsec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'appendixsec',
       'extra' => {
         'section_number' => 'A.1'
       },
diff --git a/tp/t/results/moresectioning/sectioning_part_appendix_no_top.pl 
b/tp/t/results/moresectioning/sectioning_part_appendix_no_top.pl
index f23446a2d3..95da119210 100644
--- a/tp/t/results/moresectioning/sectioning_part_appendix_no_top.pl
+++ b/tp/t/results/moresectioning/sectioning_part_appendix_no_top.pl
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'sectioning_part_appendix_no_top'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -54,24 +57,27 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -97,24 +103,27 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -140,24 +149,27 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'subsubsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsubsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsubsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsubsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -183,37 +195,14 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
   },
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chapter in part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
       'cmdname' => 'chapter',
       'contents' => [
         {
-          'text' => '
-',
-          'type' => 'empty_line'
-        }
-      ],
-      'extra' => {
-        'associated_part' => {
-          'args' => [
+          'contents' => [
             {
               'contents' => [
                 {
-                  'text' => 'part'
+                  'text' => 'chapter in part'
                 }
               ],
               'info' => {
@@ -225,8 +214,37 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
               'type' => 'line_arg'
             }
           ],
+          'type' => 'argument'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        }
+      ],
+      'extra' => {
+        'associated_part' => {
           'cmdname' => 'part',
           'contents' => [
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'text' => 'part'
+                    }
+                  ],
+                  'info' => {
+                    'spaces_after_argument' => {
+                      'text' => '
+'
+                    }
+                  },
+                  'type' => 'line_arg'
+                }
+              ],
+              'type' => 'argument'
+            },
             {
               'text' => '
 ',
@@ -262,24 +280,27 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second chapter in part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'second chapter in part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -305,24 +326,27 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -346,24 +370,27 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'appendix'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'appendix'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -389,23 +416,28 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'appendixsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'appendixsec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'appendixsec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'appendixsec',
       'extra' => {
         'section_number' => 'A.1'
       },
diff --git 
a/tp/t/results/moresectioning/sectioning_part_appendix_texi2html_chapter.pl 
b/tp/t/results/moresectioning/sectioning_part_appendix_texi2html_chapter.pl
index ccbad10b30..75913133e2 100644
--- a/tp/t/results/moresectioning/sectioning_part_appendix_texi2html_chapter.pl
+++ b/tp/t/results/moresectioning/sectioning_part_appendix_texi2html_chapter.pl
@@ -16,24 +16,27 @@ $result_trees{'sectioning_part_appendix_texi2html_chapter'} 
= {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -51,24 +54,27 @@ $result_trees{'sectioning_part_appendix_texi2html_chapter'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -88,24 +94,27 @@ $result_trees{'sectioning_part_appendix_texi2html_chapter'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -125,24 +134,27 @@ 
$result_trees{'sectioning_part_appendix_texi2html_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -162,24 +174,27 @@ 
$result_trees{'sectioning_part_appendix_texi2html_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsubsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsubsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsubsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsubsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -199,24 +214,27 @@ 
$result_trees{'sectioning_part_appendix_texi2html_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -234,24 +252,27 @@ 
$result_trees{'sectioning_part_appendix_texi2html_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter in part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter in part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -272,24 +293,27 @@ 
$result_trees{'sectioning_part_appendix_texi2html_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second chapter in part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'second chapter in part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -309,24 +333,27 @@ 
$result_trees{'sectioning_part_appendix_texi2html_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -344,24 +371,27 @@ 
$result_trees{'sectioning_part_appendix_texi2html_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'appendix'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'appendix'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -381,23 +411,28 @@ 
$result_trees{'sectioning_part_appendix_texi2html_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendixsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'appendixsec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'appendixsec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'appendixsec',
       'extra' => {
         'section_number' => 'A.1'
       },
diff --git a/tp/t/results/moresectioning/sections_test.pl 
b/tp/t/results/moresectioning/sections_test.pl
index 5faab1a69f..bcb351f577 100644
--- a/tp/t/results/moresectioning/sections_test.pl
+++ b/tp/t/results/moresectioning/sections_test.pl
@@ -16,24 +16,27 @@ $result_trees{'sections_test'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -51,24 +54,27 @@ $result_trees{'sections_test'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -88,24 +94,27 @@ $result_trees{'sections_test'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -125,24 +134,27 @@ $result_trees{'sections_test'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -162,24 +174,27 @@ $result_trees{'sections_test'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsubsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsubsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsubsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsubsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -199,24 +214,27 @@ $result_trees{'sections_test'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -234,24 +252,27 @@ $result_trees{'sections_test'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter in part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter in part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -272,24 +293,27 @@ $result_trees{'sections_test'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second chapter in part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'second chapter in part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -309,24 +333,27 @@ $result_trees{'sections_test'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -344,24 +371,27 @@ $result_trees{'sections_test'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'appendix'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'appendix'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -381,23 +411,28 @@ $result_trees{'sections_test'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendixsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'appendixsec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'appendixsec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'appendixsec',
       'extra' => {
         'section_number' => 'A.1'
       },
diff --git a/tp/t/results/moresectioning/sections_test_no_use_nodes.pl 
b/tp/t/results/moresectioning/sections_test_no_use_nodes.pl
index 1e29b672df..117edfa12e 100644
--- a/tp/t/results/moresectioning/sections_test_no_use_nodes.pl
+++ b/tp/t/results/moresectioning/sections_test_no_use_nodes.pl
@@ -16,24 +16,27 @@ $result_trees{'sections_test_no_use_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -51,24 +54,27 @@ $result_trees{'sections_test_no_use_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -88,24 +94,27 @@ $result_trees{'sections_test_no_use_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -125,24 +134,27 @@ $result_trees{'sections_test_no_use_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -162,24 +174,27 @@ $result_trees{'sections_test_no_use_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsubsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsubsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsubsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsubsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -199,24 +214,27 @@ $result_trees{'sections_test_no_use_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -234,24 +252,27 @@ $result_trees{'sections_test_no_use_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter in part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter in part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -272,24 +293,27 @@ $result_trees{'sections_test_no_use_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second chapter in part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'second chapter in part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -309,24 +333,27 @@ $result_trees{'sections_test_no_use_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -344,24 +371,27 @@ $result_trees{'sections_test_no_use_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'appendix'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'appendix'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -381,23 +411,28 @@ $result_trees{'sections_test_no_use_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendixsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'appendixsec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'appendixsec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'appendixsec',
       'extra' => {
         'section_number' => 'A.1'
       },
diff --git 
a/tp/t/results/moresectioning/sections_test_no_use_nodes_use_node_directions.pl 
b/tp/t/results/moresectioning/sections_test_no_use_nodes_use_node_directions.pl
index 4d37d29594..1ab0ffed74 100644
--- 
a/tp/t/results/moresectioning/sections_test_no_use_nodes_use_node_directions.pl
+++ 
b/tp/t/results/moresectioning/sections_test_no_use_nodes_use_node_directions.pl
@@ -16,24 +16,27 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -51,24 +54,27 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -88,24 +94,27 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -125,24 +134,27 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -162,24 +174,27 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsubsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsubsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsubsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsubsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -199,24 +214,27 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -234,24 +252,27 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter in part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter in part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -272,24 +293,27 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second chapter in part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'second chapter in part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -309,24 +333,27 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -344,24 +371,27 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'appendix'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'appendix'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -381,23 +411,28 @@ 
$result_trees{'sections_test_no_use_nodes_use_node_directions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendixsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'appendixsec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'appendixsec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'appendixsec',
       'extra' => {
         'section_number' => 'A.1'
       },
diff --git a/tp/t/results/moresectioning/shortcontents.pl 
b/tp/t/results/moresectioning/shortcontents.pl
index 7f50ac01fc..fecaa722ab 100644
--- a/tp/t/results/moresectioning/shortcontents.pl
+++ b/tp/t/results/moresectioning/shortcontents.pl
@@ -16,24 +16,27 @@ $result_trees{'shortcontents'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -51,24 +54,27 @@ $result_trees{'shortcontents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -88,24 +94,27 @@ $result_trees{'shortcontents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -125,24 +134,27 @@ $result_trees{'shortcontents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -162,24 +174,27 @@ $result_trees{'shortcontents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsubsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsubsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsubsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsubsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -199,24 +214,27 @@ $result_trees{'shortcontents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -234,24 +252,27 @@ $result_trees{'shortcontents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter in part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter in part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -272,24 +293,27 @@ $result_trees{'shortcontents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second chapter in part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'second chapter in part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -309,24 +333,27 @@ $result_trees{'shortcontents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -344,24 +371,27 @@ $result_trees{'shortcontents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'appendix'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'appendix'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -381,24 +411,27 @@ $result_trees{'shortcontents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendixsec',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'appendixsec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'appendixsec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendixsec',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/moresectioning/special_spaces_in_nodes.pl 
b/tp/t/results/moresectioning/special_spaces_in_nodes.pl
index 49a59b5bb9..6769638e5c 100644
--- a/tp/t/results/moresectioning/special_spaces_in_nodes.pl
+++ b/tp/t/results/moresectioning/special_spaces_in_nodes.pl
@@ -25,22 +25,27 @@ $result_trees{'special_spaces_in_nodes'} = {
       "type" => "before_node_section"
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "Top\x{2000}"
+              "contents" => [
+                {
+                  "text" => "Top\x{2000}"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => " \n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => " \n"
-            }
-          },
-          "type" => "line_arg"
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {
         "is_target" => 1,
         "normalized" => "Top_2002"
@@ -56,23 +61,26 @@ $result_trees{'special_spaces_in_nodes'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "top",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "top"
+              "contents" => [
+                {
+                  "text" => "top"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "top",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -90,22 +98,27 @@ $result_trees{'special_spaces_in_nodes'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "EN QUAD|\x{2000}| EM QUAD|\x{2001}| EN 
SPACE|\x{2002}|"
+              "contents" => [
+                {
+                  "text" => "EN QUAD|\x{2000}| EM QUAD|\x{2001}| EN 
SPACE|\x{2002}|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {
         "is_target" => 1,
         "normalized" => 
"EN-QUAD_007c_2002_007c-EM-QUAD_007c_2003_007c-EN-SPACE_007c_2002_007c"
@@ -121,23 +134,26 @@ $result_trees{'special_spaces_in_nodes'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "chapter",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "chap"
+              "contents" => [
+                {
+                  "text" => "chap"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "chapter",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -585,23 +601,26 @@ $result_trees{'special_spaces_in_nodes'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "CHARACTER TABULATION|\t| FORM FEED|\f| LINE 
TABULATION|\13|"
+              "contents" => [
+                {
+                  "text" => "CHARACTER TABULATION|\t| FORM FEED|\f| LINE 
TABULATION|\13|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "node",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -622,23 +641,26 @@ $result_trees{'special_spaces_in_nodes'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "CARRIAGE RETURN|\r|"
+              "contents" => [
+                {
+                  "text" => "CARRIAGE RETURN|\r|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "node",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -659,23 +681,26 @@ $result_trees{'special_spaces_in_nodes'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "NEXT LINE (NEL)|\x{85}| NO-BREAK SPACE|\x{a0}| OGHAM 
SPACE MARK|\x{1680}|"
+              "contents" => [
+                {
+                  "text" => "NEXT LINE (NEL)|\x{85}| NO-BREAK SPACE|\x{a0}| 
OGHAM SPACE MARK|\x{1680}|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "node",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -696,23 +721,26 @@ $result_trees{'special_spaces_in_nodes'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "MONGOLIAN VOWEL SEPARATOR|\x{180e}| EM 
SPACE|\x{2003}|"
+              "contents" => [
+                {
+                  "text" => "MONGOLIAN VOWEL SEPARATOR|\x{180e}| EM 
SPACE|\x{2003}|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "node",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -733,23 +761,26 @@ $result_trees{'special_spaces_in_nodes'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "THREE-PER-EM SPACE|\x{2004}| FOUR-PER-EM 
SPACE|\x{2005}| SIX-PER-EM SPACE|\x{2006}|"
+              "contents" => [
+                {
+                  "text" => "THREE-PER-EM SPACE|\x{2004}| FOUR-PER-EM 
SPACE|\x{2005}| SIX-PER-EM SPACE|\x{2006}|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "node",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -770,23 +801,26 @@ $result_trees{'special_spaces_in_nodes'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "FIGURE SPACE|\x{2007}| PUNCTUATION SPACE|\x{2008}| 
THIN SPACE|\x{2009}|"
+              "contents" => [
+                {
+                  "text" => "FIGURE SPACE|\x{2007}| PUNCTUATION 
SPACE|\x{2008}| THIN SPACE|\x{2009}|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "node",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -807,23 +841,26 @@ $result_trees{'special_spaces_in_nodes'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "HAIR SPACE|\x{200a}| LINE SEPARATOR|\x{2028}| 
PARAGRAPH SEPARATOR|\x{2029}|"
+              "contents" => [
+                {
+                  "text" => "HAIR SPACE|\x{200a}| LINE SEPARATOR|\x{2028}| 
PARAGRAPH SEPARATOR|\x{2029}|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "node",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -844,23 +881,26 @@ $result_trees{'special_spaces_in_nodes'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "NARROW NO-BREAK SPACE|\x{202f}| MEDIUM MATHEMATICAL 
SPACE|\x{205f}| IDEOGRAPHIC SPACE|\x{3000}|"
+              "contents" => [
+                {
+                  "text" => "NARROW NO-BREAK SPACE|\x{202f}| MEDIUM 
MATHEMATICAL SPACE|\x{205f}| IDEOGRAPHIC SPACE|\x{3000}|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "node",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -929,15 +969,15 @@ $result_trees{'special_spaces_in_nodes'} = {
   ],
   "type" => "document_root"
 };
-$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[1]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[1]{"contents"}[1]{"contents"}[0];
-$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[2]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[2]{"contents"}[1]{"contents"}[0];
-$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[3]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[3]{"contents"}[1]{"contents"}[0];
-$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[4]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[4]{"contents"}[1]{"contents"}[0];
-$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[5]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[5]{"contents"}[1]{"contents"}[0];
-$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[6]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[6]{"contents"}[1]{"contents"}[0];
-$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[7]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[7]{"contents"}[1]{"contents"}[0];
-$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[8]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[8]{"contents"}[1]{"contents"}[0];
-$result_trees{'special_spaces_in_nodes'}{"contents"}[12]{"contents"}[1]{"contents"}[0]{"contents"}[0]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[12]{"contents"}[1]{"contents"}[0]{"contents"}[0]{"contents"}[0];
+$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[3]{"contents"}[1]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[3]{"contents"}[1]{"contents"}[1]{"contents"}[0];
+$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[3]{"contents"}[2]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[3]{"contents"}[2]{"contents"}[1]{"contents"}[0];
+$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[3]{"contents"}[3]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[3]{"contents"}[3]{"contents"}[1]{"contents"}[0];
+$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[3]{"contents"}[4]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[3]{"contents"}[4]{"contents"}[1]{"contents"}[0];
+$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[3]{"contents"}[5]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[3]{"contents"}[5]{"contents"}[1]{"contents"}[0];
+$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[3]{"contents"}[6]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[3]{"contents"}[6]{"contents"}[1]{"contents"}[0];
+$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[3]{"contents"}[7]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[3]{"contents"}[7]{"contents"}[1]{"contents"}[0];
+$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[3]{"contents"}[8]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[3]{"contents"}[8]{"contents"}[1]{"contents"}[0];
+$result_trees{'special_spaces_in_nodes'}{"contents"}[12]{"contents"}[2]{"contents"}[0]{"contents"}[0]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[12]{"contents"}[2]{"contents"}[0]{"contents"}[0]{"contents"}[0];
 
 $result_texis{'special_spaces_in_nodes'} = '
 @node Top  
diff --git a/tp/t/results/moresectioning/top_chapter_sections.pl 
b/tp/t/results/moresectioning/top_chapter_sections.pl
index ea03b23320..b6195277cc 100644
--- a/tp/t/results/moresectioning/top_chapter_sections.pl
+++ b/tp/t/results/moresectioning/top_chapter_sections.pl
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'top_chapter_sections'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -52,24 +55,27 @@ $result_trees{'top_chapter_sections'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -93,24 +99,27 @@ $result_trees{'top_chapter_sections'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'First chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'First chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -136,24 +145,27 @@ $result_trees{'top_chapter_sections'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'second'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -179,24 +191,27 @@ $result_trees{'top_chapter_sections'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -222,24 +237,27 @@ $result_trees{'top_chapter_sections'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section of chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section of chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -265,24 +283,27 @@ $result_trees{'top_chapter_sections'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -308,24 +329,27 @@ $result_trees{'top_chapter_sections'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -351,23 +375,28 @@ $result_trees{'top_chapter_sections'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '3'
       },
diff --git a/tp/t/results/moresectioning/top_node_up_url.pl 
b/tp/t/results/moresectioning/top_node_up_url.pl
index e03f39fc37..29e004e71e 100644
--- a/tp/t/results/moresectioning/top_node_up_url.pl
+++ b/tp/t/results/moresectioning/top_node_up_url.pl
@@ -8,23 +8,28 @@ use utf8;
 $result_trees{'top_node_up_url'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -44,24 +49,27 @@ $result_trees{'top_node_up_url'} = [
       },
       {},
       {
-        'args' => [
+        'cmdname' => 'top',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'internal top node up'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'internal top node up'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'top',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -186,23 +194,28 @@ $result_trees{'top_node_up_url'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -223,7 +236,7 @@ $result_trees{'top_node_up_url'} = [
   }
 ];
 $result_trees{'top_node_up_url'}[0]{'unit_contents'}[1] = 
$result_trees{'top_node_up_url'}[0]{'unit_command'};
-$result_trees{'top_node_up_url'}[0]{'unit_contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_node_up_url'}[0]{'unit_contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'top_node_up_url'}[0]{'unit_contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_node_up_url'}[0]{'unit_contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 $result_trees{'top_node_up_url'}[1]{'unit_contents'}[0] = 
$result_trees{'top_node_up_url'}[1]{'unit_command'};
 
 $result_texis{'top_node_up_url'} = '@node Top
diff --git a/tp/t/results/moresectioning/topic_guide.pl 
b/tp/t/results/moresectioning/topic_guide.pl
index 5db2c64d2a..c8788bb098 100644
--- a/tp/t/results/moresectioning/topic_guide.pl
+++ b/tp/t/results/moresectioning/topic_guide.pl
@@ -31,23 +31,28 @@ $result_trees{'topic_guide'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'topic_guide'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'A example quide topic collection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'A example quide topic collection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -270,23 +278,28 @@ $result_trees{'topic_guide'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'guide1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'guide1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'guide1'
@@ -302,24 +315,27 @@ $result_trees{'topic_guide'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'guide 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'guide 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -554,43 +570,46 @@ $result_trees{'topic_guide'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'topic1'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'topic2'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'topic1'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'topic2'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'topic2'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'topic2'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -751,64 +770,67 @@ $result_trees{'topic_guide'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'topic2'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'topic3'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'topic2'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'topic3'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'topic1'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'topic3'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'topic3'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'topic1'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'topic1'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'topic1'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -969,64 +991,67 @@ $result_trees{'topic_guide'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'topic3'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'topic5'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'topic3'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'topic5'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'topic2'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'topic5'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'topic5'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'topic2'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'topic2'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'topic2'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1140,24 +1165,27 @@ $result_trees{'topic_guide'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'topic4'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'topic4'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1318,51 +1346,54 @@ $result_trees{'topic_guide'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'topic5'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'topic3'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'topic5'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'topic3'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
+            {
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'spaces_before_argument' => {
-              'text' => ' '
+            {
+              'contents' => [
+                {
+                  'text' => 'topic3'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'topic3'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1570,23 +1601,28 @@ $result_trees{'topic_guide'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'guide2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'guide2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'guide2'
@@ -1602,24 +1638,27 @@ $result_trees{'topic_guide'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'guide 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'guide 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1819,24 +1858,24 @@ $result_trees{'topic_guide'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'topic_guide'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'topic_guide'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'topic_guide'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'topic_guide'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'topic_guide'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'topic_guide'}{'contents'}[5]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'topic_guide'}{'contents'}[5]{'args'}[1]{'contents'}[0];
-$result_trees{'topic_guide'}{'contents'}[5]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[5]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'topic_guide'}{'contents'}[6]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'topic_guide'}{'contents'}[6]{'args'}[1]{'contents'}[0];
-$result_trees{'topic_guide'}{'contents'}[6]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'topic_guide'}{'contents'}[6]{'args'}[2]{'contents'}[0];
-$result_trees{'topic_guide'}{'contents'}[6]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[6]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'topic_guide'}{'contents'}[7]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'topic_guide'}{'contents'}[7]{'args'}[1]{'contents'}[0];
-$result_trees{'topic_guide'}{'contents'}[7]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'topic_guide'}{'contents'}[7]{'args'}[2]{'contents'}[0];
-$result_trees{'topic_guide'}{'contents'}[8]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[8]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'topic_guide'}{'contents'}[9]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'topic_guide'}{'contents'}[9]{'args'}[2]{'contents'}[0];
-$result_trees{'topic_guide'}{'contents'}[9]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[9]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'topic_guide'}{'contents'}[9]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[9]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'topic_guide'}{'contents'}[11]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[11]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'topic_guide'}{'contents'}[11]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[11]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'topic_guide'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'topic_guide'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'topic_guide'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'topic_guide'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'topic_guide'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'topic_guide'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'topic_guide'}{'contents'}[5]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[5]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'topic_guide'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'topic_guide'}{'contents'}[6]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'topic_guide'}{'contents'}[6]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[6]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'topic_guide'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'topic_guide'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'topic_guide'}{'contents'}[8]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[8]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'topic_guide'}{'contents'}[9]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[9]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'topic_guide'}{'contents'}[9]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[9]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'topic_guide'}{'contents'}[9]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[9]{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'topic_guide'}{'contents'}[11]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[11]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'topic_guide'}{'contents'}[11]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'topic_guide'}{'contents'}[11]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'topic_guide'} = '\\input texinfo.tex
 
diff --git a/tp/t/results/plaintext_tests/all_spaces.pl 
b/tp/t/results/plaintext_tests/all_spaces.pl
index b9a69071cc..85a003370f 100644
--- a/tp/t/results/plaintext_tests/all_spaces.pl
+++ b/tp/t/results/plaintext_tests/all_spaces.pl
@@ -53,22 +53,27 @@ $result_trees{'all_spaces'} = {
       "type" => "before_node_section"
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "Top"
+              "contents" => [
+                {
+                  "text" => "Top"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {
         "is_target" => 1,
         "normalized" => "Top"
@@ -84,23 +89,26 @@ $result_trees{'all_spaces'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "chap"
+              "contents" => [
+                {
+                  "text" => "chap"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "node",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
diff --git 
a/tp/t/results/plaintext_tests/cartouche_and_paragraph_indentation.pl 
b/tp/t/results/plaintext_tests/cartouche_and_paragraph_indentation.pl
index a4046080b1..acf23386d8 100644
--- a/tp/t/results/plaintext_tests/cartouche_and_paragraph_indentation.pl
+++ b/tp/t/results/plaintext_tests/cartouche_and_paragraph_indentation.pl
@@ -11,23 +11,28 @@ $result_trees{'cartouche_and_paragraph_indentation'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'cartouche_and_paragraph_indentation'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -77,23 +85,28 @@ $result_trees{'cartouche_and_paragraph_indentation'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -108,24 +121,27 @@ $result_trees{'cartouche_and_paragraph_indentation'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -273,23 +289,28 @@ $result_trees{'cartouche_and_paragraph_indentation'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap2'
@@ -304,24 +325,27 @@ $result_trees{'cartouche_and_paragraph_indentation'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'c2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'c2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 251382b592..17270ccf92 100644
--- a/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl
+++ b/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl
@@ -93,23 +93,28 @@ $result_trees{'chinese_mixed_with_en'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -125,24 +130,27 @@ $result_trees{'chinese_mixed_with_en'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Mixed chinese and english'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Mixed chinese and english'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -175,23 +183,28 @@ $result_trees{'chinese_mixed_with_en'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Mixed english and chinese'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Mixed english and chinese'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Mixed-english-and-chinese'
@@ -207,24 +220,27 @@ $result_trees{'chinese_mixed_with_en'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Mixed english and chinese'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Mixed english and chinese'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/plaintext_tests/japanese_utf8.pl 
b/tp/t/results/plaintext_tests/japanese_utf8.pl
index 7049e9f69c..fae8c92861 100644
--- a/tp/t/results/plaintext_tests/japanese_utf8.pl
+++ b/tp/t/results/plaintext_tests/japanese_utf8.pl
@@ -165,23 +165,28 @@ $result_trees{'japanese_utf8'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -197,24 +202,27 @@ $result_trees{'japanese_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "GNU LilyPond --- 
\x{5b66}\x{7fd2}\x{30de}\x{30cb}\x{30e5}\x{30a2}\x{30eb}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "GNU LilyPond --- 
\x{5b66}\x{7fd2}\x{30de}\x{30cb}\x{30e5}\x{30a2}\x{30eb}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -562,23 +570,28 @@ $result_trees{'japanese_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Preface'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Preface'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Preface'
@@ -594,24 +607,27 @@ $result_trees{'japanese_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Preface'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Preface'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -651,23 +667,28 @@ $result_trees{'japanese_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Introduction'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Introduction'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Introduction'
@@ -683,24 +704,27 @@ $result_trees{'japanese_utf8'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Introduction'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Introduction'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -747,8 +771,8 @@ $result_trees{'japanese_utf8'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'japanese_utf8'} = '\\input texinfo @c -*- coding: utf-8; mode: 
texinfo; -*-
 @documentencoding UTF-8
diff --git a/tp/t/results/plaintext_tests/line_passed_and_formats.pl 
b/tp/t/results/plaintext_tests/line_passed_and_formats.pl
index 3b2fa7f119..d26d10bcc1 100644
--- a/tp/t/results/plaintext_tests/line_passed_and_formats.pl
+++ b/tp/t/results/plaintext_tests/line_passed_and_formats.pl
@@ -11,24 +11,27 @@ $result_trees{'line_passed_and_formats'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2196,8 +2199,8 @@ $result_trees{'line_passed_and_formats'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[50]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[50]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[50]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[50]{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[51]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[51]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[51]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[51]{'contents'}[1]{'contents'}[1]{'contents'}[3];
 
 $result_texis{'line_passed_and_formats'} = '@node Top
 
diff --git a/tp/t/results/plaintext_tests/no_empty_line_after_section.pl 
b/tp/t/results/plaintext_tests/no_empty_line_after_section.pl
index bee3374b1e..6ad7b4ea27 100644
--- a/tp/t/results/plaintext_tests/no_empty_line_after_section.pl
+++ b/tp/t/results/plaintext_tests/no_empty_line_after_section.pl
@@ -22,24 +22,27 @@ $result_trees{'no_empty_line_after_section'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -66,24 +69,27 @@ $result_trees{'no_empty_line_after_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'args' => [
             {
@@ -132,24 +138,27 @@ $result_trees{'no_empty_line_after_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -226,24 +235,27 @@ $result_trees{'no_empty_line_after_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'after sp'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'after sp'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'cmdname' => 'indent',
           'source_info' => {
diff --git a/tp/t/results/plaintext_tests/non_break_spaces.pl 
b/tp/t/results/plaintext_tests/non_break_spaces.pl
index 20069bc3f6..79aff91666 100644
--- a/tp/t/results/plaintext_tests/non_break_spaces.pl
+++ b/tp/t/results/plaintext_tests/non_break_spaces.pl
@@ -55,24 +55,27 @@ $result_trees{'non_break_spaces'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 e0b2c80e5e..dd1072378a 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
@@ -31,23 +31,28 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -99,23 +107,28 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-chap'
@@ -131,24 +144,27 @@ $result_trees{'punctuation_sc_accents_ascii_glyph'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 eb35182c5f..52e66222e6 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
@@ -70,23 +70,28 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} 
= {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -102,24 +107,27 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -138,23 +146,28 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-chap'
@@ -170,24 +183,27 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 d8ad19361a..a4f9cf571a 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
@@ -70,23 +70,28 @@ $result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} 
= {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -102,24 +107,27 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -138,23 +146,28 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-chap'
@@ -170,24 +183,27 @@ 
$result_trees{'punctuation_sc_accents_ascii_glyph_usascii'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 61480cd3d7..9564dbd03b 100644
--- a/tp/t/results/plaintext_tests/punctuation_sc_accents_default.pl
+++ b/tp/t/results/plaintext_tests/punctuation_sc_accents_default.pl
@@ -31,23 +31,28 @@ $result_trees{'punctuation_sc_accents_default'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'punctuation_sc_accents_default'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -99,23 +107,28 @@ $result_trees{'punctuation_sc_accents_default'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-chap'
@@ -131,24 +144,27 @@ $result_trees{'punctuation_sc_accents_default'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 7489f7f4b8..ccc381ac81 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
@@ -70,23 +70,28 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -102,24 +107,27 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -138,23 +146,28 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-chap'
@@ -170,24 +183,27 @@ $result_trees{'punctuation_sc_accents_default_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 67dc7f4630..9aa9d1288e 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
@@ -70,23 +70,28 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -102,24 +107,27 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -138,23 +146,28 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-chap'
@@ -170,24 +183,27 @@ $result_trees{'punctuation_sc_accents_default_usascii'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 99adc2edf4..4d998b925e 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
@@ -31,23 +31,28 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -99,23 +107,28 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-chap'
@@ -131,24 +144,27 @@ $result_trees{'punctuation_sc_accents_disable_encoding'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 c68e4a3eff..ba44eb2701 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
@@ -70,23 +70,28 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -102,24 +107,27 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -138,23 +146,28 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-chap'
@@ -170,24 +183,27 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 d76b471f5a..d8347d8b94 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
@@ -70,23 +70,28 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -102,24 +107,27 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -138,23 +146,28 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-chap'
@@ -170,24 +183,27 @@ 
$result_trees{'punctuation_sc_accents_disable_encoding_usascii'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 0c524f13a0..6bedfecf00 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
@@ -70,23 +70,28 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -102,24 +107,27 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -138,23 +146,28 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-chap'
@@ -170,24 +183,27 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 9906b87eb1..ef13017da3 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
@@ -70,23 +70,28 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -102,24 +107,27 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -138,23 +146,28 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-chap'
@@ -170,24 +183,27 @@ 
$result_trees{'punctuation_sc_accents_to_utf8_ascii_glyph_usascii'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 fca4b602ed..a0ac2b2de0 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
@@ -70,23 +70,28 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -102,24 +107,27 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -138,23 +146,28 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-chap'
@@ -170,24 +183,27 @@ $result_trees{'punctuation_sc_accents_to_utf8_latin1'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 129ced0b2a..0359b45b06 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
@@ -70,23 +70,28 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -102,24 +107,27 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -138,23 +146,28 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-chap'
@@ -170,24 +183,27 @@ $result_trees{'punctuation_sc_accents_to_utf8_usascii'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/plaintext_tests/quote_node_names.pl 
b/tp/t/results/plaintext_tests/quote_node_names.pl
index fd052ea076..09aafdef91 100644
--- a/tp/t/results/plaintext_tests/quote_node_names.pl
+++ b/tp/t/results/plaintext_tests/quote_node_names.pl
@@ -16,23 +16,28 @@ $result_trees{'quote_node_names'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -48,19 +53,22 @@ $result_trees{'quote_node_names'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1414,23 +1422,28 @@ $result_trees{'quote_node_names'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'blah:blah'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'blah:blah'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'blah_003ablah'
@@ -1446,24 +1459,27 @@ $result_trees{'quote_node_names'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'blah:blah'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'blah:blah'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1498,23 +1514,28 @@ $result_trees{'quote_node_names'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'blumpty.fump'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'blumpty.fump'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'blumpty_002efump'
@@ -1530,24 +1551,27 @@ $result_trees{'quote_node_names'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'blumpty.fump'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'blumpty.fump'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1568,160 +1592,165 @@ $result_trees{'quote_node_names'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'normal node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '('
-            },
-            {
-              'text' => 'man'
-            },
-            {
-              'cmdname' => 'comma',
               'contents' => [
                 {
-                  'type' => 'brace_container'
+                  'text' => 'normal node'
                 }
               ],
-              'source_info' => {
-                'file_name' => 'nodequote.texi',
-                'line_nr' => 50
-              }
-            },
-            {
-              'text' => 'u:a.l'
-            },
-            {
-              'text' => ')'
-            },
-            {
-              'text' => 'direction'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
-              'contents' => [
-                {},
-                {},
-                {}
-              ]
+              'type' => 'line_arg'
             },
-            'node_content' => {
-              'contents' => [
-                {}
-              ]
-            },
-            'normalized' => 'direction'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => '('
-            },
-            {
-              'text' => 'man_ual'
-            },
-            {
-              'text' => ')'
-            },
-            {
-              'text' => 'direct'
-            },
-            {
-              'cmdname' => 'comma',
               'contents' => [
                 {
-                  'type' => 'brace_container'
+                  'text' => '('
+                },
+                {
+                  'text' => 'man'
+                },
+                {
+                  'cmdname' => 'comma',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'file_name' => 'nodequote.texi',
+                    'line_nr' => 50
+                  }
+                },
+                {
+                  'text' => 'u:a.l'
+                },
+                {
+                  'text' => ')'
+                },
+                {
+                  'text' => 'direction'
                 }
               ],
-              'source_info' => {
-                'file_name' => 'nodequote.texi',
-                'line_nr' => 50
-              }
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {},
+                    {},
+                    {}
+                  ]
+                },
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'direction'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => 'ion'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
-              'contents' => [
-                {}
-              ]
-            },
-            'node_content' => {
               'contents' => [
-                {},
-                {},
-                {}
-              ]
-            },
-            'normalized' => 'direct_002cion'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
-            },
-            {
-              'text' => 'man_ual'
-            },
-            {
-              'text' => ')'
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'man_ual'
+                },
+                {
+                  'text' => ')'
+                },
+                {
+                  'text' => 'direct'
+                },
+                {
+                  'cmdname' => 'comma',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'file_name' => 'nodequote.texi',
+                    'line_nr' => 50
+                  }
+                },
+                {
+                  'text' => 'ion'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'node_content' => {
+                  'contents' => [
+                    {},
+                    {},
+                    {}
+                  ]
+                },
+                'normalized' => 'direct_002cion'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => 'direct::i.on'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
-              'contents' => [
-                {}
-              ]
-            },
-            'node_content' => {
               'contents' => [
-                {}
-              ]
-            },
-            'normalized' => 'direct_003a_003ai_002eon'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'man_ual'
+                },
+                {
+                  'text' => ')'
+                },
+                {
+                  'text' => 'direct::i.on'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'direct_003a_003ai_002eon'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'normal-node'
@@ -1737,24 +1766,27 @@ $result_trees{'quote_node_names'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'normal node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'normal node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1775,37 +1807,42 @@ $result_trees{'quote_node_names'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'asis',
               'contents' => [
                 {
+                  'cmdname' => 'asis',
                   'contents' => [
                     {
-                      'text' => 'secret,node'
+                      'contents' => [
+                        {
+                          'text' => 'secret,node'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'file_name' => 'nodequote.texi',
+                    'line_nr' => 53
+                  }
                 }
               ],
-              'source_info' => {
-                'file_name' => 'nodequote.texi',
-                'line_nr' => 53
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'secret_002cnode'
@@ -1821,38 +1858,41 @@ $result_trees{'quote_node_names'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'asis',
               'contents' => [
                 {
+                  'cmdname' => 'asis',
                   'contents' => [
                     {
-                      'text' => 'secret,node'
+                      'contents' => [
+                        {
+                          'text' => 'secret,node'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'file_name' => 'nodequote.texi',
+                    'line_nr' => 54
+                  }
                 }
               ],
-              'source_info' => {
-                'file_name' => 'nodequote.texi',
-                'line_nr' => 54
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1873,24 +1913,27 @@ $result_trees{'quote_node_names'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top secret node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top secret node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1923,42 +1966,42 @@ $result_trees{'quote_node_names'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'contents'}[3]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'contents'}[3]{'contents'}[1];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'contents'}[3]{'contents'}[2];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[4]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[4]{'contents'}[3]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[5]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[5]{'contents'}[3]{'contents'}[0];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[5]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[5]{'contents'}[3]{'contents'}[1];
-$result_trees{'quote_node_names'}{'contents'}[7]{'args'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = $result_trees{'quote_node_names'}{'contents'}[7]{'args'}[1]{'contents'}[1];
-$result_trees{'quote_node_names'}{'contents'}[7]{'args'}[1]{'extra'}{'manual_content'}{'contents'}[1]
 = $result_trees{'quote_node_names'}{'contents'}[7]{'args'}[1]{'contents'}[2];
-$result_trees{'quote_node_names'}{'contents'}[7]{'args'}[1]{'extra'}{'manual_content'}{'contents'}[2]
 = $result_trees{'quote_node_names'}{'contents'}[7]{'args'}[1]{'contents'}[3];
-$result_trees{'quote_node_names'}{'contents'}[7]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'quote_node_names'}{'contents'}[7]{'args'}[1]{'contents'}[5];
-$result_trees{'quote_node_names'}{'contents'}[7]{'args'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = $result_trees{'quote_node_names'}{'contents'}[7]{'args'}[2]{'contents'}[1];
-$result_trees{'quote_node_names'}{'contents'}[7]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'quote_node_names'}{'contents'}[7]{'args'}[2]{'contents'}[3];
-$result_trees{'quote_node_names'}{'contents'}[7]{'args'}[2]{'extra'}{'node_content'}{'contents'}[1]
 = $result_trees{'quote_node_names'}{'contents'}[7]{'args'}[2]{'contents'}[4];
-$result_trees{'quote_node_names'}{'contents'}[7]{'args'}[2]{'extra'}{'node_content'}{'contents'}[2]
 = $result_trees{'quote_node_names'}{'contents'}[7]{'args'}[2]{'contents'}[5];
-$result_trees{'quote_node_names'}{'contents'}[7]{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = $result_trees{'quote_node_names'}{'contents'}[7]{'args'}[3]{'contents'}[1];
-$result_trees{'quote_node_names'}{'contents'}[7]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'quote_node_names'}{'contents'}[7]{'args'}[3]{'contents'}[3];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[28]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[28]{'contents'}[2]{'contents'}[3]{'contents'}[0];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[28]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[28]{'contents'}[2]{'contents'}[3]{'contents'}[1];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[28]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[28]{'contents'}[2]{'contents'}[3]{'contents'}[2];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[28]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[28]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[28]{'contents'}[4]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[28]{'contents'}[4]{'contents'}[3]{'contents'}[0];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[28]{'contents'}[5]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[28]{'contents'}[5]{'contents'}[3]{'contents'}[0];
+$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[28]{'contents'}[5]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[28]{'contents'}[5]{'contents'}[3]{'contents'}[1];
+$result_trees{'quote_node_names'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'quote_node_names'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[1]
 = 
$result_trees{'quote_node_names'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'quote_node_names'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[2]
 = 
$result_trees{'quote_node_names'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[3];
+$result_trees{'quote_node_names'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[5];
+$result_trees{'quote_node_names'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'quote_node_names'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'contents'}[3];
+$result_trees{'quote_node_names'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'quote_node_names'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'contents'}[4];
+$result_trees{'quote_node_names'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'quote_node_names'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'contents'}[5];
+$result_trees{'quote_node_names'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'quote_node_names'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'quote_node_names'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'contents'}[3];
 
 $result_texis{'quote_node_names'} = '@node Top
 @top
diff --git a/tp/t/results/plaintext_tests/settitle_and_empty_top.pl 
b/tp/t/results/plaintext_tests/settitle_and_empty_top.pl
index f8019fe64a..b850abb22b 100644
--- a/tp/t/results/plaintext_tests/settitle_and_empty_top.pl
+++ b/tp/t/results/plaintext_tests/settitle_and_empty_top.pl
@@ -45,19 +45,22 @@ $result_trees{'settitle_and_empty_top'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/raw/inlineraw_not_closed.pl 
b/tp/t/results/raw/inlineraw_not_closed.pl
index 9c0e0fc330..090e6fdc0f 100644
--- a/tp/t/results/raw/inlineraw_not_closed.pl
+++ b/tp/t/results/raw/inlineraw_not_closed.pl
@@ -52,23 +52,28 @@ $result_trees{'inlineraw_not_closed'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {
         'section_number' => '1'
       },
diff --git a/tp/t/results/regions/anchor_in_copying.pl 
b/tp/t/results/regions/anchor_in_copying.pl
index 932217fa99..14d33c62dc 100644
--- a/tp/t/results/regions/anchor_in_copying.pl
+++ b/tp/t/results/regions/anchor_in_copying.pl
@@ -132,24 +132,27 @@ $result_trees{'anchor_in_copying'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -170,24 +173,27 @@ $result_trees{'anchor_in_copying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -286,7 +292,7 @@ $result_trees{'anchor_in_copying'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_copying'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_copying'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'anchor_in_copying'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_copying'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'anchor_in_copying'} = '
 @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 ac6416b61b..9fdc20f4a4 100644
--- a/tp/t/results/regions/anchor_in_copying_in_footnote.pl
+++ b/tp/t/results/regions/anchor_in_copying_in_footnote.pl
@@ -154,24 +154,27 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -192,24 +195,27 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -308,7 +314,7 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[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 03f77d032e..ae2c8d2ecc 100644
--- a/tp/t/results/regions/anchor_in_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage.pl
@@ -108,23 +108,28 @@ $result_trees{'anchor_in_titlepage'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'top',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
@@ -136,24 +141,27 @@ $result_trees{'anchor_in_titlepage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -174,23 +182,28 @@ $result_trees{'anchor_in_titlepage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
@@ -204,24 +217,27 @@ $result_trees{'anchor_in_titlepage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'nchap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'nchap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -277,7 +293,7 @@ $result_trees{'anchor_in_titlepage'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_titlepage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_titlepage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'anchor_in_titlepage'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_titlepage'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[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 b6b4f0b439..ec589d66d1 100644
--- a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
@@ -108,23 +108,28 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'top',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
@@ -136,24 +141,27 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -174,23 +182,28 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
@@ -204,24 +217,27 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'nchap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'nchap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -277,7 +293,7 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[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 a86dd70691..5bfa6493a6 100644
--- a/tp/t/results/regions/format_in_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage.pl
@@ -146,23 +146,28 @@ $result_trees{'format_in_titlepage'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -177,24 +182,27 @@ $result_trees{'format_in_titlepage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/regions/format_in_titlepage_titlepage.pl 
b/tp/t/results/regions/format_in_titlepage_titlepage.pl
index 3ef2cf25eb..a7298c502a 100644
--- a/tp/t/results/regions/format_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage_titlepage.pl
@@ -146,23 +146,28 @@ $result_trees{'format_in_titlepage_titlepage'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -177,24 +182,27 @@ $result_trees{'format_in_titlepage_titlepage'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/regions/ref_in_copying.pl 
b/tp/t/results/regions/ref_in_copying.pl
index d8bf858b7d..15fda1d665 100644
--- a/tp/t/results/regions/ref_in_copying.pl
+++ b/tp/t/results/regions/ref_in_copying.pl
@@ -108,23 +108,28 @@ $result_trees{'ref_in_copying'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -139,24 +144,27 @@ $result_trees{'ref_in_copying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -296,23 +304,28 @@ $result_trees{'ref_in_copying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'GFDL'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'GFDL'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'GFDL'
@@ -327,24 +340,27 @@ $result_trees{'ref_in_copying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'GFDL'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'GFDL'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -367,7 +383,7 @@ $result_trees{'ref_in_copying'} = {
   'type' => 'document_root'
 };
 
$result_trees{'ref_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'ref_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'ref_in_copying'} = '@copying
 @ref{GFDL}
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 ef3b5b66ed..501b0d7ffd 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
@@ -108,23 +108,28 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -139,24 +144,27 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -174,23 +182,28 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Intro'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Intro'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Intro'
@@ -205,24 +218,27 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Introduction'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Introduction'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -364,23 +380,28 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'GFDL'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'GFDL'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'GFDL'
@@ -395,24 +416,27 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'GFDL'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'GFDL'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -435,7 +459,7 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
   'type' => 'document_root'
 };
 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'ref_in_copying_insert_in_chapter'} = '@copying
 @ref{GFDL}
diff --git a/tp/t/results/regions/today_in_copying.pl 
b/tp/t/results/regions/today_in_copying.pl
index a8ccfde2f2..9620ce15df 100644
--- a/tp/t/results/regions/today_in_copying.pl
+++ b/tp/t/results/regions/today_in_copying.pl
@@ -95,23 +95,28 @@ $result_trees{'today_in_copying'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -126,24 +131,27 @@ $result_trees{'today_in_copying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -161,24 +169,27 @@ $result_trees{'today_in_copying'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/sectioning/a_comma_after_node.pl 
b/tp/t/results/sectioning/a_comma_after_node.pl
index 3e0cc859de..6b18f636b6 100644
--- a/tp/t/results/sectioning/a_comma_after_node.pl
+++ b/tp/t/results/sectioning/a_comma_after_node.pl
@@ -11,64 +11,67 @@ $result_trees{'a_comma_after_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'Commands'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Requirements'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Commands'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'Requirements'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Nodes and Menus'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Requirements'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Requirements'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Nodes-and-Menus'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Nodes and Menus'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Nodes-and-Menus'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -100,8 +103,8 @@ $result_trees{'a_comma_after_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'a_comma_after_node'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'a_comma_after_node'}{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'a_comma_after_node'}{'contents'}[1]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'a_comma_after_node'}{'contents'}[1]{'args'}[2]{'contents'}[0];
+$result_trees{'a_comma_after_node'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'a_comma_after_node'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'a_comma_after_node'}{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'a_comma_after_node'}{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
 $result_texis{'a_comma_after_node'} = '@node Commands, Requirements, Nodes and 
Menus
 
diff --git a/tp/t/results/sectioning/anchor_zero.pl 
b/tp/t/results/sectioning/anchor_zero.pl
index 0b97f87d74..b566199ed8 100644
--- a/tp/t/results/sectioning/anchor_zero.pl
+++ b/tp/t/results/sectioning/anchor_zero.pl
@@ -11,24 +11,27 @@ $result_trees{'anchor_zero'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -118,7 +121,7 @@ $result_trees{'anchor_zero'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'anchor_zero'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_zero'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'anchor_zero'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'anchor_zero'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[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 c031fa9aae..e069c55510 100644
--- a/tp/t/results/sectioning/at_commands_in_node.pl
+++ b/tp/t/results/sectioning/at_commands_in_node.pl
@@ -11,176 +11,181 @@ $result_trees{'at_commands_in_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'A '
-            },
-            {
-              'cmdname' => 'sc',
               'contents' => [
                 {
+                  'text' => 'A '
+                },
+                {
+                  'cmdname' => 'sc',
                   'contents' => [
                     {
-                      'text' => 'sc'
+                      'contents' => [
+                        {
+                          'text' => 'sc'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 1
-              }
-            },
-            {
-              'text' => ' node '
-            },
-            {
-              'cmdname' => '"',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 1
+                  }
+                },
+                {
+                  'text' => ' node '
+                },
                 {
+                  'cmdname' => '"',
                   'contents' => [
                     {
-                      'text' => 'i'
+                      'contents' => [
+                        {
+                          'text' => 'i'
+                        }
+                      ],
+                      'type' => 'following_arg'
                     }
                   ],
-                  'type' => 'following_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 1
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '"',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 1
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
+                  'cmdname' => '"',
                   'contents' => [
                     {
-                      'cmdname' => 'dotless',
                       'contents' => [
                         {
+                          'cmdname' => 'dotless',
                           'contents' => [
                             {
-                              'text' => 'i'
+                              'contents' => [
+                                {
+                                  'text' => 'i'
+                                }
+                              ],
+                              'type' => 'brace_container'
                             }
                           ],
-                          'type' => 'brace_container'
+                          'source_info' => {
+                            'line_nr' => 1
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 1
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 1
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => '`',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 1
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => '`',
                   'contents' => [
                     {
-                      'cmdname' => '=',
                       'contents' => [
                         {
+                          'cmdname' => '=',
                           'contents' => [
                             {
-                              'text' => 'E'
+                              'contents' => [
+                                {
+                                  'text' => 'E'
+                                }
+                              ],
+                              'type' => 'following_arg'
                             }
                           ],
-                          'type' => 'following_arg'
+                          'source_info' => {
+                            'line_nr' => 1
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 1
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 1
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'l',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 1
+                  }
+                },
                 {
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 1
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => ',',
-              'contents' => [
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'l',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 1
+                  }
+                },
                 {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => ',',
                   'contents' => [
                     {
-                      'cmdname' => '\'',
                       'contents' => [
                         {
+                          'cmdname' => '\'',
                           'contents' => [
                             {
-                              'text' => 'C'
+                              'contents' => [
+                                {
+                                  'text' => 'C'
+                                }
+                              ],
+                              'type' => 'following_arg'
                             }
                           ],
-                          'type' => 'following_arg'
+                          'source_info' => {
+                            'line_nr' => 1
+                          }
                         }
                       ],
-                      'source_info' => {
-                        'line_nr' => 1
-                      }
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 1
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'exclamdown',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 1
+                  }
+                },
+                {
+                  'text' => ' '
+                },
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'exclamdown',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 1
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 1
-              }
+              'type' => 'line_arg'
             }
           ],
-          'type' => 'line_arg'
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'A-sc-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
diff --git a/tp/t/results/sectioning/automatic_menu_referencing_node.pl 
b/tp/t/results/sectioning/automatic_menu_referencing_node.pl
index 6d1738f431..888fdf47bf 100644
--- a/tp/t/results/sectioning/automatic_menu_referencing_node.pl
+++ b/tp/t/results/sectioning/automatic_menu_referencing_node.pl
@@ -11,23 +11,28 @@ $result_trees{'automatic_menu_referencing_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'automatic_menu_referencing_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -77,23 +85,28 @@ $result_trees{'automatic_menu_referencing_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Chapter'
@@ -108,24 +121,27 @@ $result_trees{'automatic_menu_referencing_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -145,23 +161,28 @@ $result_trees{'automatic_menu_referencing_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -176,23 +197,28 @@ $result_trees{'automatic_menu_referencing_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {
         'section_number' => '1.1'
       },
diff --git a/tp/t/results/sectioning/chapter_before_and_after_part.pl 
b/tp/t/results/sectioning/chapter_before_and_after_part.pl
index 433f7be167..0e4912e341 100644
--- a/tp/t/results/sectioning/chapter_before_and_after_part.pl
+++ b/tp/t/results/sectioning/chapter_before_and_after_part.pl
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'chapter_before_and_after_part'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -59,24 +62,27 @@ $result_trees{'chapter_before_and_after_part'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -99,24 +105,27 @@ $result_trees{'chapter_before_and_after_part'} = [
       ],
       'extra' => {
         'associated_part' => {
-          'args' => [
+          'cmdname' => 'part',
+          'contents' => [
             {
               'contents' => [
                 {
-                  'text' => 'part'
-                }
-              ],
-              'info' => {
-                'spaces_after_argument' => {
-                  'text' => '
+                  'contents' => [
+                    {
+                      'text' => 'part'
+                    }
+                  ],
+                  'info' => {
+                    'spaces_after_argument' => {
+                      'text' => '
 '
+                    }
+                  },
+                  'type' => 'line_arg'
                 }
-              },
-              'type' => 'line_arg'
-            }
-          ],
-          'cmdname' => 'part',
-          'contents' => [
+              ],
+              'type' => 'argument'
+            },
             {
               'text' => '
 ',
diff --git a/tp/t/results/sectioning/chapter_before_part.pl 
b/tp/t/results/sectioning/chapter_before_part.pl
index 47cd3723c7..8b232bf47b 100644
--- a/tp/t/results/sectioning/chapter_before_part.pl
+++ b/tp/t/results/sectioning/chapter_before_part.pl
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'chapter_before_part'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -59,23 +62,28 @@ $result_trees{'chapter_before_part'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'part',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
diff --git a/tp/t/results/sectioning/chapter_between_nodes.pl 
b/tp/t/results/sectioning/chapter_between_nodes.pl
index 5aca353b9b..19ea222a37 100644
--- a/tp/t/results/sectioning/chapter_between_nodes.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes.pl
@@ -16,23 +16,28 @@ $result_trees{'chapter_between_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'chapter_between_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -194,24 +202,27 @@ $result_trees{'chapter_between_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -245,45 +256,50 @@ $result_trees{'chapter_between_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'section node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'section node'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section-node'
@@ -298,24 +314,27 @@ $result_trees{'chapter_between_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -365,8 +384,8 @@ $result_trees{'chapter_between_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'chapter_between_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'chapter_between_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'chapter_between_nodes'}{'contents'}[4]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'chapter_between_nodes'}{'contents'}[4]{'args'}[3]{'contents'}[0];
+$result_trees{'chapter_between_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'chapter_between_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'chapter_between_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'chapter_between_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'chapter_between_nodes'} = '@node Top
 @top top section
diff --git a/tp/t/results/sectioning/chapter_between_nodes_texi2html.pl 
b/tp/t/results/sectioning/chapter_between_nodes_texi2html.pl
index 3eaf6e7dae..0e73dbd29a 100644
--- a/tp/t/results/sectioning/chapter_between_nodes_texi2html.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes_texi2html.pl
@@ -11,23 +11,28 @@ $result_trees{'chapter_between_nodes_texi2html'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'chapter_between_nodes_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -189,24 +197,27 @@ $result_trees{'chapter_between_nodes_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -240,45 +251,50 @@ $result_trees{'chapter_between_nodes_texi2html'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'section node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'section node'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section-node'
@@ -293,24 +309,27 @@ $result_trees{'chapter_between_nodes_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -360,8 +379,8 @@ $result_trees{'chapter_between_nodes_texi2html'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'chapter_between_nodes_texi2html'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'chapter_between_nodes_texi2html'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'chapter_between_nodes_texi2html'}{'contents'}[4]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'chapter_between_nodes_texi2html'}{'contents'}[4]{'args'}[3]{'contents'}[0];
+$result_trees{'chapter_between_nodes_texi2html'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'chapter_between_nodes_texi2html'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'chapter_between_nodes_texi2html'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'chapter_between_nodes_texi2html'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'chapter_between_nodes_texi2html'} = '@node Top
 @top top section
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 5bdc43f032..55ac908ea2 100644
--- a/tp/t/results/sectioning/chapter_between_nodes_with_appendix.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes_with_appendix.pl
@@ -11,23 +11,28 @@ $result_trees{'chapter_between_nodes_with_appendix'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,23 +47,28 @@ $result_trees{'chapter_between_nodes_with_appendix'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'top',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
@@ -70,24 +80,27 @@ $result_trees{'chapter_between_nodes_with_appendix'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Main'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Main'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -219,23 +232,28 @@ $result_trees{'chapter_between_nodes_with_appendix'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Additional'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Additional'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Additional'
@@ -250,23 +268,28 @@ $result_trees{'chapter_between_nodes_with_appendix'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Annex'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Annex'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'appendix',
       'extra' => {
         'section_number' => 'A'
       },
@@ -282,7 +305,7 @@ $result_trees{'chapter_between_nodes_with_appendix'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'chapter_between_nodes_with_appendix'}{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'chapter_between_nodes_with_appendix'}{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'chapter_between_nodes_with_appendix'}{'contents'}[3]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'chapter_between_nodes_with_appendix'}{'contents'}[3]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'chapter_between_nodes_with_appendix'} = '@node Top
 @top top section
diff --git 
a/tp/t/results/sectioning/chapter_between_nodes_with_appendix_nomenu.pl 
b/tp/t/results/sectioning/chapter_between_nodes_with_appendix_nomenu.pl
index ff3ee7f5b1..b9d83989f0 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
@@ -11,23 +11,28 @@ $result_trees{'chapter_between_nodes_with_appendix_nomenu'} 
= {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,23 +47,28 @@ $result_trees{'chapter_between_nodes_with_appendix_nomenu'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'top',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
@@ -70,24 +80,27 @@ $result_trees{'chapter_between_nodes_with_appendix_nomenu'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Main'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Main'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -219,23 +232,28 @@ 
$result_trees{'chapter_between_nodes_with_appendix_nomenu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Additional'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Additional'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Additional'
@@ -250,23 +268,28 @@ 
$result_trees{'chapter_between_nodes_with_appendix_nomenu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Annex'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Annex'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'appendix',
       'extra' => {
         'section_number' => 'A'
       },
@@ -282,7 +305,7 @@ $result_trees{'chapter_between_nodes_with_appendix_nomenu'} 
= {
   ],
   'type' => 'document_root'
 };
-$result_trees{'chapter_between_nodes_with_appendix_nomenu'}{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'chapter_between_nodes_with_appendix_nomenu'}{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'chapter_between_nodes_with_appendix_nomenu'}{'contents'}[3]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'chapter_between_nodes_with_appendix_nomenu'}{'contents'}[3]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'chapter_between_nodes_with_appendix_nomenu'} = '@node Top
 @top top section
diff --git a/tp/t/results/sectioning/chapter_node_before_and_after_part.pl 
b/tp/t/results/sectioning/chapter_node_before_and_after_part.pl
index 555e42026c..bdbf6cf0a8 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
@@ -18,23 +18,28 @@ $result_trees{'chapter_node_before_and_after_part'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -49,24 +54,27 @@ $result_trees{'chapter_node_before_and_after_part'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -189,24 +197,27 @@ $result_trees{'chapter_node_before_and_after_part'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -224,23 +235,28 @@ $result_trees{'chapter_node_before_and_after_part'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'after'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'after'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'after'
@@ -255,24 +271,27 @@ $result_trees{'chapter_node_before_and_after_part'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -309,7 +328,7 @@ $result_trees{'chapter_node_before_and_after_part'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'chapter_node_before_and_after_part'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'chapter_node_before_and_after_part'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'chapter_node_before_and_after_part'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'chapter_node_before_and_after_part'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'chapter_node_before_and_after_part'}{'contents'}[5]{'extra'}{'associated_part'}
 = $result_trees{'chapter_node_before_and_after_part'}{'contents'}[3];
 
 $result_texis{'chapter_node_before_and_after_part'} = '
diff --git a/tp/t/results/sectioning/character_and_spaces_in_node.pl 
b/tp/t/results/sectioning/character_and_spaces_in_node.pl
index 1b69407e1f..c17626c91b 100644
--- a/tp/t/results/sectioning/character_and_spaces_in_node.pl
+++ b/tp/t/results/sectioning/character_and_spaces_in_node.pl
@@ -18,23 +18,28 @@ $result_trees{'character_and_spaces_in_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -49,84 +54,89 @@ $result_trees{'character_and_spaces_in_node'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chap nodes'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '!_"#$%&\'()*+-.'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chap nodes'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '!_"#$%&\'()*+-.'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap-nodes'
@@ -141,84 +151,89 @@ $result_trees{'character_and_spaces_in_node'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => '!_"#$%&\'()*+-.'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '/;<=>?[\\]^_`|~'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '!_"#$%&\'()*+-.'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'chap nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '/;<=>?[\\]^_`|~'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'chap-nodes'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'chap nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chap nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'chap-nodes'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'chap-nodes'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'chap nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'chap-nodes'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
@@ -233,74 +248,79 @@ $result_trees{'character_and_spaces_in_node'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => '/;<=>?[\\]^_`|~'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'local   node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '/;<=>?[\\]^_`|~'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'local-node'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => '!_"#$%&\'()*+-.'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'local   node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'local-node'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'chap nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '!_"#$%&\'()*+-.'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'chap-nodes'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'chap nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'chap-nodes'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
@@ -315,58 +335,63 @@ $result_trees{'character_and_spaces_in_node'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'local   node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '/;<=>?[\\]^_`|~'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'local   node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'chap nodes'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '/;<=>?[\\]^_`|~'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'chap-nodes'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'chap nodes'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'chap-nodes'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'local-node'
@@ -383,17 +408,17 @@ $result_trees{'character_and_spaces_in_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'args'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'args'}[2]{'contents'}[0];
-$result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'args'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-$result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'args'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'args'}[2]{'contents'}[0];
-$result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'args'}[3]{'contents'}[0];
-$result_trees{'character_and_spaces_in_node'}{'contents'}[5]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[5]{'args'}[2]{'contents'}[0];
-$result_trees{'character_and_spaces_in_node'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[5]{'args'}[3]{'contents'}[0];
+$result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'character_and_spaces_in_node'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'character_and_spaces_in_node'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_node'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'character_and_spaces_in_node'} = '
 @node Top
diff --git a/tp/t/results/sectioning/contents_and_parts.pl 
b/tp/t/results/sectioning/contents_and_parts.pl
index 429efb62b6..0779c8cd6c 100644
--- a/tp/t/results/sectioning/contents_and_parts.pl
+++ b/tp/t/results/sectioning/contents_and_parts.pl
@@ -16,23 +16,28 @@ $result_trees{'contents_and_parts'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'contents_and_parts'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -277,24 +285,27 @@ $result_trees{'contents_and_parts'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'part 1: part 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'part 1: part 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -312,23 +323,28 @@ $result_trees{'contents_and_parts'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter 1 node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter 1 node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-1-node'
@@ -343,24 +359,27 @@ $result_trees{'contents_and_parts'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -381,23 +400,28 @@ $result_trees{'contents_and_parts'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter 2 node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter 2 node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-2-node'
@@ -412,24 +436,27 @@ $result_trees{'contents_and_parts'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -449,24 +476,27 @@ $result_trees{'contents_and_parts'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'part2: part2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'part2: part2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -484,23 +514,28 @@ $result_trees{'contents_and_parts'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter 3 node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter 3 node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-3-node'
@@ -515,24 +550,27 @@ $result_trees{'contents_and_parts'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter 3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter 3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -583,9 +621,9 @@ $result_trees{'contents_and_parts'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
 $result_trees{'contents_and_parts'}{'contents'}[5]{'extra'}{'associated_part'} 
= $result_trees{'contents_and_parts'}{'contents'}[3];
 
$result_trees{'contents_and_parts'}{'contents'}[10]{'extra'}{'associated_part'} 
= $result_trees{'contents_and_parts'}{'contents'}[8];
 
diff --git a/tp/t/results/sectioning/contents_in_html_text.pl 
b/tp/t/results/sectioning/contents_in_html_text.pl
index 9601167608..4cff626eba 100644
--- a/tp/t/results/sectioning/contents_in_html_text.pl
+++ b/tp/t/results/sectioning/contents_in_html_text.pl
@@ -11,24 +11,27 @@ $result_trees{'contents_in_html_text'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -46,24 +49,27 @@ $result_trees{'contents_in_html_text'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -83,24 +89,27 @@ $result_trees{'contents_in_html_text'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sec 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sec 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -120,24 +129,27 @@ $result_trees{'contents_in_html_text'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 eda5097022..568d50a917 100644
--- a/tp/t/results/sectioning/contents_with_only_top_node.pl
+++ b/tp/t/results/sectioning/contents_with_only_top_node.pl
@@ -26,24 +26,27 @@ $result_trees{'contents_with_only_top_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/sectioning/double_node_anchor_float.pl 
b/tp/t/results/sectioning/double_node_anchor_float.pl
index 443d31117a..35b44ed99e 100644
--- a/tp/t/results/sectioning/double_node_anchor_float.pl
+++ b/tp/t/results/sectioning/double_node_anchor_float.pl
@@ -11,24 +11,27 @@ $result_trees{'double_node_anchor_float'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -49,24 +52,27 @@ $result_trees{'double_node_anchor_float'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -145,24 +151,27 @@ $result_trees{'double_node_anchor_float'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'anchor1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'anchor1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -429,23 +438,28 @@ $result_trees{'double_node_anchor_float'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'float1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'float1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'normalized' => 'float1'
       },
diff --git a/tp/t/results/sectioning/double_part.pl 
b/tp/t/results/sectioning/double_part.pl
index 0a2bfc3f06..4a1f6a85ae 100644
--- a/tp/t/results/sectioning/double_part.pl
+++ b/tp/t/results/sectioning/double_part.pl
@@ -9,24 +9,27 @@ $result_trees{'double_part'} = [
   {
     'first_in_page' => {},
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -156,23 +159,28 @@ $result_trees{'double_part'} = [
         'type' => 'before_node_section'
       },
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'Top'
@@ -193,24 +201,27 @@ $result_trees{'double_part'} = [
   {
     'first_in_page' => {},
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'part first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'part first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -244,37 +255,14 @@ $result_trees{'double_part'} = [
   {
     'first_in_page' => {},
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chapter after 2 parts'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
       'cmdname' => 'chapter',
       'contents' => [
         {
-          'text' => '
-',
-          'type' => 'empty_line'
-        }
-      ],
-      'extra' => {
-        'associated_part' => {
-          'args' => [
+          'contents' => [
             {
               'contents' => [
                 {
-                  'text' => 'part second'
+                  'text' => 'chapter after 2 parts'
                 }
               ],
               'info' => {
@@ -286,8 +274,37 @@ $result_trees{'double_part'} = [
               'type' => 'line_arg'
             }
           ],
+          'type' => 'argument'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        }
+      ],
+      'extra' => {
+        'associated_part' => {
           'cmdname' => 'part',
           'contents' => [
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'text' => 'part second'
+                    }
+                  ],
+                  'info' => {
+                    'spaces_after_argument' => {
+                      'text' => '
+'
+                    }
+                  },
+                  'type' => 'line_arg'
+                }
+              ],
+              'type' => 'argument'
+            },
             {
               'contents' => [
                 {
@@ -327,23 +344,28 @@ $result_trees{'double_part'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'node chapter'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'node chapter'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'node-chapter'
@@ -363,7 +385,7 @@ $result_trees{'double_part'} = [
   }
 ];
 $result_trees{'double_part'}[0]{'first_in_page'} = 
$result_trees{'double_part'}[0];
-$result_trees{'double_part'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_part'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_part'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_part'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 $result_trees{'double_part'}[0]{'unit_contents'}[2] = 
$result_trees{'double_part'}[0]{'unit_command'};
 $result_trees{'double_part'}[1]{'first_in_page'} = 
$result_trees{'double_part'}[1];
 $result_trees{'double_part'}[1]{'unit_contents'}[0] = 
$result_trees{'double_part'}[1]{'unit_command'};
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 225e2cc4fe..dd7672b65d 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
@@ -16,23 +16,28 @@ 
$result_trees{'double_recursive_self_section_node_reference'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ 
$result_trees{'double_recursive_self_section_node_reference'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ 
$result_trees{'double_recursive_self_section_node_reference'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node1'
@@ -113,45 +126,48 @@ 
$result_trees{'double_recursive_self_section_node_reference'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'ref',
               'contents' => [
                 {
+                  'cmdname' => 'ref',
                   'contents' => [
                     {
-                      'text' => 'to node1'
+                      'contents' => [
+                        {
+                          'text' => 'to node1'
+                        }
+                      ],
+                      'extra' => {
+                        'node_content' => {
+                          'contents' => [
+                            {}
+                          ]
+                        },
+                        'normalized' => 'to-node1'
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'extra' => {
-                    'node_content' => {
-                      'contents' => [
-                        {}
-                      ]
-                    },
-                    'normalized' => 'to-node1'
-                  },
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 5
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 5
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -171,47 +187,52 @@ 
$result_trees{'double_recursive_self_section_node_reference'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'to '
-            },
-            {
-              'cmdname' => 'ref',
               'contents' => [
                 {
+                  'text' => 'to '
+                },
+                {
+                  'cmdname' => 'ref',
                   'contents' => [
                     {
-                      'text' => 'node1'
+                      'contents' => [
+                        {
+                          'text' => 'node1'
+                        }
+                      ],
+                      'extra' => {
+                        'node_content' => {
+                          'contents' => [
+                            {}
+                          ]
+                        },
+                        'normalized' => 'node1'
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'extra' => {
-                    'node_content' => {
-                      'contents' => [
-                        {}
-                      ]
-                    },
-                    'normalized' => 'node1'
-                  },
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 7
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 7
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'to-node1'
@@ -228,8 +249,8 @@ 
$result_trees{'double_recursive_self_section_node_reference'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[5]{'args'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[5]{'args'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_recursive_self_section_node_reference'}{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'double_recursive_self_section_node_reference'} = '@node Top
 @top top
diff --git 
a/tp/t/results/sectioning/double_recursive_self_section_node_reference_no_use_node.pl
 
b/tp/t/results/sectioning/double_recursive_self_section_node_reference_no_use_node.pl
index feb361c606..7f4265ba19 100644
--- 
a/tp/t/results/sectioning/double_recursive_self_section_node_reference_no_use_node.pl
+++ 
b/tp/t/results/sectioning/double_recursive_self_section_node_reference_no_use_node.pl
@@ -16,23 +16,28 @@ 
$result_trees{'double_recursive_self_section_node_reference_no_use_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ 
$result_trees{'double_recursive_self_section_node_reference_no_use_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ 
$result_trees{'double_recursive_self_section_node_reference_no_use_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node1'
@@ -113,45 +126,48 @@ 
$result_trees{'double_recursive_self_section_node_reference_no_use_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'ref',
               'contents' => [
                 {
+                  'cmdname' => 'ref',
                   'contents' => [
                     {
-                      'text' => 'to node1'
+                      'contents' => [
+                        {
+                          'text' => 'to node1'
+                        }
+                      ],
+                      'extra' => {
+                        'node_content' => {
+                          'contents' => [
+                            {}
+                          ]
+                        },
+                        'normalized' => 'to-node1'
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'extra' => {
-                    'node_content' => {
-                      'contents' => [
-                        {}
-                      ]
-                    },
-                    'normalized' => 'to-node1'
-                  },
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 5
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 5
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -171,47 +187,52 @@ 
$result_trees{'double_recursive_self_section_node_reference_no_use_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'to '
-            },
-            {
-              'cmdname' => 'ref',
               'contents' => [
                 {
+                  'text' => 'to '
+                },
+                {
+                  'cmdname' => 'ref',
                   'contents' => [
                     {
-                      'text' => 'node1'
+                      'contents' => [
+                        {
+                          'text' => 'node1'
+                        }
+                      ],
+                      'extra' => {
+                        'node_content' => {
+                          'contents' => [
+                            {}
+                          ]
+                        },
+                        'normalized' => 'node1'
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'extra' => {
-                    'node_content' => {
-                      'contents' => [
-                        {}
-                      ]
-                    },
-                    'normalized' => 'node1'
-                  },
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 7
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 7
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'to-node1'
@@ -228,8 +249,8 @@ 
$result_trees{'double_recursive_self_section_node_reference_no_use_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_recursive_self_section_node_reference_no_use_node'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_recursive_self_section_node_reference_no_use_node'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'double_recursive_self_section_node_reference_no_use_node'}{'contents'}[5]{'args'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_recursive_self_section_node_reference_no_use_node'}{'contents'}[5]{'args'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'double_recursive_self_section_node_reference_no_use_node'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_recursive_self_section_node_reference_no_use_node'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'double_recursive_self_section_node_reference_no_use_node'}{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_recursive_self_section_node_reference_no_use_node'}{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'double_recursive_self_section_node_reference_no_use_node'} = 
'@node Top
 @top top
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 91cd151bd6..b1fbd29fbe 100644
--- a/tp/t/results/sectioning/double_recursive_self_section_reference.pl
+++ b/tp/t/results/sectioning/double_recursive_self_section_reference.pl
@@ -16,23 +16,28 @@ $result_trees{'double_recursive_self_section_reference'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'n1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'n1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'n1'
@@ -47,45 +52,48 @@ $result_trees{'double_recursive_self_section_reference'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'ref',
               'contents' => [
                 {
+                  'cmdname' => 'ref',
                   'contents' => [
                     {
-                      'text' => 'n2'
+                      'contents' => [
+                        {
+                          'text' => 'n2'
+                        }
+                      ],
+                      'extra' => {
+                        'node_content' => {
+                          'contents' => [
+                            {}
+                          ]
+                        },
+                        'normalized' => 'n2'
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'extra' => {
-                    'node_content' => {
-                      'contents' => [
-                        {}
-                      ]
-                    },
-                    'normalized' => 'n2'
-                  },
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 2
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 2
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -105,23 +113,28 @@ $result_trees{'double_recursive_self_section_reference'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'n2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'n2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'n2'
@@ -136,44 +149,49 @@ $result_trees{'double_recursive_self_section_reference'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'ref',
               'contents' => [
                 {
+                  'cmdname' => 'ref',
                   'contents' => [
                     {
-                      'text' => 'n1'
+                      'contents' => [
+                        {
+                          'text' => 'n1'
+                        }
+                      ],
+                      'extra' => {
+                        'node_content' => {
+                          'contents' => [
+                            {}
+                          ]
+                        },
+                        'normalized' => 'n1'
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'extra' => {
-                    'node_content' => {
-                      'contents' => [
-                        {}
-                      ]
-                    },
-                    'normalized' => 'n1'
-                  },
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 5
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 5
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '2'
       },
@@ -189,8 +207,8 @@ $result_trees{'double_recursive_self_section_reference'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_recursive_self_section_reference'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_recursive_self_section_reference'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'double_recursive_self_section_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_recursive_self_section_reference'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'double_recursive_self_section_reference'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_recursive_self_section_reference'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'double_recursive_self_section_reference'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_recursive_self_section_reference'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'double_recursive_self_section_reference'} = '@node n1
 @chapter @ref{n2}
diff --git a/tp/t/results/sectioning/double_top.pl 
b/tp/t/results/sectioning/double_top.pl
index 6eee4651ed..f6781b0de6 100644
--- a/tp/t/results/sectioning/double_top.pl
+++ b/tp/t/results/sectioning/double_top.pl
@@ -11,43 +11,46 @@ $result_trees{'double_top'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'ToP'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'ToP'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -68,59 +71,62 @@ $result_trees{'double_top'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'ToP'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'top'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'ToP'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -170,9 +176,9 @@ $result_trees{'double_top'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_top'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'double_top'}{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'double_top'}{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'double_top'}{'contents'}[2]{'args'}[2]{'contents'}[0];
-$result_trees{'double_top'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'double_top'}{'contents'}[2]{'args'}[3]{'contents'}[0];
+$result_trees{'double_top'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_top'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_top'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_top'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'double_top'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_top'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'double_top'} = '@node ToP, top
 
diff --git a/tp/t/results/sectioning/double_top_in_menu.pl 
b/tp/t/results/sectioning/double_top_in_menu.pl
index 2a5b521be2..8d18dfafcd 100644
--- a/tp/t/results/sectioning/double_top_in_menu.pl
+++ b/tp/t/results/sectioning/double_top_in_menu.pl
@@ -11,43 +11,46 @@ $result_trees{'double_top_in_menu'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'ToP'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'ToP'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -226,59 +229,62 @@ $result_trees{'double_top_in_menu'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'ToP'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'top'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'ToP'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -304,11 +310,11 @@ $result_trees{'double_top_in_menu'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'double_top_in_menu'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'double_top_in_menu'}{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'double_top_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_top_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_top_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_top_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'double_top_in_menu'}{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'double_top_in_menu'}{'contents'}[2]{'args'}[2]{'contents'}[0];
-$result_trees{'double_top_in_menu'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'double_top_in_menu'}{'contents'}[2]{'args'}[3]{'contents'}[0];
+$result_trees{'double_top_in_menu'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_top_in_menu'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_top_in_menu'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_top_in_menu'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_top_in_menu'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_top_in_menu'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'double_top_in_menu'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_top_in_menu'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'double_top_in_menu'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'double_top_in_menu'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'double_top_in_menu'} = '@node ToP, top
 Top node
diff --git a/tp/t/results/sectioning/double_top_section.pl 
b/tp/t/results/sectioning/double_top_section.pl
index 28b3c13f20..44936dfe20 100644
--- a/tp/t/results/sectioning/double_top_section.pl
+++ b/tp/t/results/sectioning/double_top_section.pl
@@ -11,24 +11,27 @@ $result_trees{'double_top_section'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'First top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'First top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -60,24 +63,27 @@ $result_trees{'double_top_section'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Second top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Second top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/sectioning/email_in_node.pl 
b/tp/t/results/sectioning/email_in_node.pl
index cb9a8cca7b..6f3a0708b8 100644
--- a/tp/t/results/sectioning/email_in_node.pl
+++ b/tp/t/results/sectioning/email_in_node.pl
@@ -11,113 +11,118 @@ $result_trees{'email_in_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'email',
               'contents' => [
                 {
+                  'cmdname' => 'email',
                   'contents' => [
                     {
-                      'text' => 'a'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_after_argument' => {
+                          'text' => ' '
+                        },
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => ' '
-                    },
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 1
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'email',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 1
+                  }
+                },
                 {
-                  'contents' => [
-                    {
-                      'text' => 'c'
-                    }
-                  ],
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
+                  'text' => ' '
                 },
                 {
+                  'cmdname' => 'email',
                   'contents' => [
                     {
-                      'text' => 'd'
+                      'contents' => [
+                        {
+                          'text' => 'c'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_after_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'd'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
-                }
-              ],
-              'source_info' => {
-                'line_nr' => 1
-              }
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'email',
-              'contents' => [
+                  'source_info' => {
+                    'line_nr' => 1
+                  }
+                },
                 {
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
+                  'text' => ' '
                 },
                 {
+                  'cmdname' => 'email',
                   'contents' => [
                     {
-                      'text' => 'e'
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'e'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_before_argument' => {
+                          'text' => ' '
+                        }
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'info' => {
-                    'spaces_before_argument' => {
-                      'text' => ' '
-                    }
-                  },
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 1
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 1
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'a-c-'
diff --git a/tp/t/results/sectioning/empty_node.pl 
b/tp/t/results/sectioning/empty_node.pl
index d69dab4e38..6601873452 100644
--- a/tp/t/results/sectioning/empty_node.pl
+++ b/tp/t/results/sectioning/empty_node.pl
@@ -11,19 +11,22 @@ $result_trees{'empty_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -35,79 +38,84 @@ $result_trees{'empty_node'} = {
       }
     },
     {
-      'args' => [
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'next'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
-              'contents' => [
-                {}
-              ]
+              'type' => 'line_arg'
             },
-            'normalized' => 'next'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'prev'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'next'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'next'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'prev'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'up'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'prev'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'prev'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'up'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'up'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'up'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'info' => {
         'spaces_before_argument' => {
           'text' => ' '
@@ -120,9 +128,9 @@ $result_trees{'empty_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'empty_node'}{'contents'}[2]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'empty_node'}{'contents'}[2]{'args'}[1]{'contents'}[0];
-$result_trees{'empty_node'}{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'empty_node'}{'contents'}[2]{'args'}[2]{'contents'}[0];
-$result_trees{'empty_node'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'empty_node'}{'contents'}[2]{'args'}[3]{'contents'}[0];
+$result_trees{'empty_node'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'empty_node'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'empty_node'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'empty_node'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'empty_node'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'empty_node'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'empty_node'} = '@node
 
diff --git a/tp/t/results/sectioning/empty_nodes_with_commands.pl 
b/tp/t/results/sectioning/empty_nodes_with_commands.pl
index fa7af2d590..9c177a7239 100644
--- a/tp/t/results/sectioning/empty_nodes_with_commands.pl
+++ b/tp/t/results/sectioning/empty_nodes_with_commands.pl
@@ -18,25 +18,28 @@ $result_trees{'empty_nodes_with_commands'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
-          'info' => {
-            'comment_at_end' => {
-              'args' => [
-                {
-                  'text' => ' comment
+          'contents' => [
+            {
+              'info' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'text' => ' comment
 ',
-                  'type' => 'rawline_arg'
+                      'type' => 'rawline_arg'
+                    }
+                  ],
+                  'cmdname' => 'c'
                 }
-              ],
-              'cmdname' => 'c'
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -53,18 +56,23 @@ $result_trees{'empty_nodes_with_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => '
+              'contents' => [
+                {
+                  'cmdname' => '
 '
+                }
+              ],
+              'type' => 'line_arg'
             }
           ],
-          'type' => 'line_arg'
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'info' => {
         'spaces_before_argument' => {
           'text' => ' '
@@ -75,23 +83,28 @@ $result_trees{'empty_nodes_with_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => ':'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'cmdname' => ':'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'info' => {
         'spaces_before_argument' => {
           'text' => ' '
@@ -102,36 +115,41 @@ $result_trees{'empty_nodes_with_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'asis',
               'contents' => [
                 {
+                  'cmdname' => 'asis',
                   'contents' => [
                     {
-                      'text' => ' '
+                      'contents' => [
+                        {
+                          'text' => ' '
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 6
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 6
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'info' => {
         'spaces_before_argument' => {
           'text' => ' '
diff --git a/tp/t/results/sectioning/empty_ref_arg.pl 
b/tp/t/results/sectioning/empty_ref_arg.pl
index b810d78efc..19d0e61400 100644
--- a/tp/t/results/sectioning/empty_ref_arg.pl
+++ b/tp/t/results/sectioning/empty_ref_arg.pl
@@ -11,24 +11,27 @@ $result_trees{'empty_ref_arg'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -298,10 +301,10 @@ $result_trees{'empty_ref_arg'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[0];
+$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0];
+$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'empty_ref_arg'}{'contents'}[1]{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'empty_ref_arg'} = '@node first
 
diff --git a/tp/t/results/sectioning/empty_section_in_chapter.pl 
b/tp/t/results/sectioning/empty_section_in_chapter.pl
index f2e9c95581..e65a80d48a 100644
--- a/tp/t/results/sectioning/empty_section_in_chapter.pl
+++ b/tp/t/results/sectioning/empty_section_in_chapter.pl
@@ -16,24 +16,27 @@ $result_trees{'empty_section_in_chapter'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -53,18 +56,23 @@ $result_trees{'empty_section_in_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {
         'section_number' => '1.1'
       },
diff --git a/tp/t/results/sectioning/equivalent_labels.pl 
b/tp/t/results/sectioning/equivalent_labels.pl
index db4be9f193..0af23137f0 100644
--- a/tp/t/results/sectioning/equivalent_labels.pl
+++ b/tp/t/results/sectioning/equivalent_labels.pl
@@ -11,24 +11,27 @@ $result_trees{'equivalent_labels'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -347,8 +350,8 @@ $result_trees{'equivalent_labels'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'equivalent_labels'} = '@node first
 
diff --git a/tp/t/results/sectioning/equivalent_nodes.pl 
b/tp/t/results/sectioning/equivalent_nodes.pl
index 6228e747c0..5a1d2b5deb 100644
--- a/tp/t/results/sectioning/equivalent_nodes.pl
+++ b/tp/t/results/sectioning/equivalent_nodes.pl
@@ -11,56 +11,59 @@ $result_trees{'equivalent_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'type' => 'line_arg'
+            },
             {
-              'cmdname' => 'emph',
               'contents' => [
                 {
+                  'cmdname' => 'emph',
                   'contents' => [
                     {
-                      'text' => 'node'
+                      'contents' => [
+                        {
+                          'text' => 'node'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 1
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 1
-              }
-            }
-          ],
-          'extra' => {
-            'node_content' => {
-              'contents' => [
-                {}
-              ]
-            },
-            'normalized' => 'node'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'node'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -197,37 +200,40 @@ $result_trees{'equivalent_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'samp',
               'contents' => [
                 {
+                  'cmdname' => 'samp',
                   'contents' => [
                     {
-                      'text' => 'node'
+                      'contents' => [
+                        {
+                          'text' => 'node'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 7
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 7
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -283,9 +289,9 @@ $result_trees{'equivalent_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'equivalent_nodes'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'equivalent_nodes'}{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'equivalent_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'equivalent_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'equivalent_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'equivalent_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'equivalent_nodes'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'equivalent_nodes'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'equivalent_nodes'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'equivalent_nodes'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'equivalent_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'equivalent_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'equivalent_nodes'} = '@node first, @emph{node}
 
diff --git a/tp/t/results/sectioning/equivalent_nodes_novalidate.pl 
b/tp/t/results/sectioning/equivalent_nodes_novalidate.pl
index 85a4e1f16a..90b6bfb2af 100644
--- a/tp/t/results/sectioning/equivalent_nodes_novalidate.pl
+++ b/tp/t/results/sectioning/equivalent_nodes_novalidate.pl
@@ -31,56 +31,59 @@ $result_trees{'equivalent_nodes_novalidate'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'type' => 'line_arg'
+            },
             {
-              'cmdname' => 'emph',
               'contents' => [
                 {
+                  'cmdname' => 'emph',
                   'contents' => [
                     {
-                      'text' => 'node'
+                      'contents' => [
+                        {
+                          'text' => 'node'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 3
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 3
-              }
-            }
-          ],
-          'extra' => {
-            'node_content' => {
-              'contents' => [
-                {}
-              ]
-            },
-            'normalized' => 'node'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'node'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -217,37 +220,40 @@ $result_trees{'equivalent_nodes_novalidate'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'samp',
               'contents' => [
                 {
+                  'cmdname' => 'samp',
                   'contents' => [
                     {
-                      'text' => 'node'
+                      'contents' => [
+                        {
+                          'text' => 'node'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 9
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 9
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -303,9 +309,9 @@ $result_trees{'equivalent_nodes_novalidate'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'equivalent_nodes_novalidate'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'equivalent_nodes_novalidate'}{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'equivalent_nodes_novalidate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'equivalent_nodes_novalidate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'equivalent_nodes_novalidate'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'equivalent_nodes_novalidate'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'equivalent_nodes_novalidate'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'equivalent_nodes_novalidate'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'equivalent_nodes_novalidate'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'equivalent_nodes_novalidate'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'equivalent_nodes_novalidate'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'equivalent_nodes_novalidate'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'equivalent_nodes_novalidate'} = '@novalidate
 
diff --git a/tp/t/results/sectioning/explicit_node_directions.pl 
b/tp/t/results/sectioning/explicit_node_directions.pl
index 764aa119c0..39e667accd 100644
--- a/tp/t/results/sectioning/explicit_node_directions.pl
+++ b/tp/t/results/sectioning/explicit_node_directions.pl
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'explicit_node_directions'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -208,77 +211,80 @@ $result_trees{'explicit_node_directions'} = [
   },
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chap node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'third node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chap node'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'third-node'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'third node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'third-node'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -319,58 +325,63 @@ $result_trees{'explicit_node_directions'} = [
   },
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'third node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'third node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'chap-node'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chap node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'chap-node'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'third-node'
@@ -390,15 +401,15 @@ $result_trees{'explicit_node_directions'} = [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'explicit_node_directions'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'explicit_node_directions'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'explicit_node_directions'}[0]{'unit_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'explicit_node_directions'}[0]{'unit_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'explicit_node_directions'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'explicit_node_directions'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'explicit_node_directions'}[0]{'unit_command'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'explicit_node_directions'}[0]{'unit_command'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 $result_trees{'explicit_node_directions'}[0]{'unit_contents'}[1] = 
$result_trees{'explicit_node_directions'}[0]{'unit_command'};
-$result_trees{'explicit_node_directions'}[1]{'unit_command'}{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'explicit_node_directions'}[1]{'unit_command'}{'args'}[1]{'contents'}[0];
-$result_trees{'explicit_node_directions'}[1]{'unit_command'}{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'explicit_node_directions'}[1]{'unit_command'}{'args'}[2]{'contents'}[0];
-$result_trees{'explicit_node_directions'}[1]{'unit_command'}{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'explicit_node_directions'}[1]{'unit_command'}{'args'}[3]{'contents'}[0];
+$result_trees{'explicit_node_directions'}[1]{'unit_command'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'explicit_node_directions'}[1]{'unit_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'explicit_node_directions'}[1]{'unit_command'}{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'explicit_node_directions'}[1]{'unit_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'explicit_node_directions'}[1]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'explicit_node_directions'}[1]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'explicit_node_directions'}[1]{'unit_contents'}[0] = 
$result_trees{'explicit_node_directions'}[1]{'unit_command'};
-$result_trees{'explicit_node_directions'}[2]{'unit_command'}{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'explicit_node_directions'}[2]{'unit_command'}{'args'}[2]{'contents'}[0];
-$result_trees{'explicit_node_directions'}[2]{'unit_command'}{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'explicit_node_directions'}[2]{'unit_command'}{'args'}[3]{'contents'}[0];
+$result_trees{'explicit_node_directions'}[2]{'unit_command'}{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'explicit_node_directions'}[2]{'unit_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'explicit_node_directions'}[2]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'explicit_node_directions'}[2]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'explicit_node_directions'}[2]{'unit_contents'}[0] = 
$result_trees{'explicit_node_directions'}[2]{'unit_command'};
 
 $result_texis{'explicit_node_directions'} = '@node Top
diff --git a/tp/t/results/sectioning/external_node_in_menu.pl 
b/tp/t/results/sectioning/external_node_in_menu.pl
index 8cdca40d42..077ab8444f 100644
--- a/tp/t/results/sectioning/external_node_in_menu.pl
+++ b/tp/t/results/sectioning/external_node_in_menu.pl
@@ -11,23 +11,28 @@ $result_trees{'external_node_in_menu'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'external_node_in_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -286,23 +294,28 @@ $result_trees{'external_node_in_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'nchapter1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'nchapter1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'nchapter1'
@@ -317,24 +330,27 @@ $result_trees{'external_node_in_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -354,23 +370,28 @@ $result_trees{'external_node_in_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'nchapter2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'nchapter2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'nchapter2'
@@ -385,23 +406,28 @@ $result_trees{'external_node_in_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '2'
       },
@@ -417,10 +443,10 @@ $result_trees{'external_node_in_menu'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
-$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[3];
+$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'external_node_in_menu'} = '@node Top
 @top top
diff --git a/tp/t/results/sectioning/hole_in_sectioning.pl 
b/tp/t/results/sectioning/hole_in_sectioning.pl
index 38a4f8fc1f..f169d753cc 100644
--- a/tp/t/results/sectioning/hole_in_sectioning.pl
+++ b/tp/t/results/sectioning/hole_in_sectioning.pl
@@ -11,24 +11,27 @@ $result_trees{'hole_in_sectioning'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -46,24 +49,27 @@ $result_trees{'hole_in_sectioning'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -83,24 +89,27 @@ $result_trees{'hole_in_sectioning'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -120,24 +129,27 @@ $result_trees{'hole_in_sectioning'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsubsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsubsection with no subsection above'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsubsection with no subsection above'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsubsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -157,23 +169,28 @@ $result_trees{'hole_in_sectioning'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'the subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'the subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'subsection',
       'extra' => {
         'section_number' => '1.1.2'
       },
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 9d246593c2..1f9f05ee4e 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
@@ -16,22 +16,27 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
       "type" => "before_node_section"
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "Top"
+              "contents" => [
+                {
+                  "text" => "Top"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {
         "is_target" => 1,
         "normalized" => "Top"
@@ -47,23 +52,26 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "top",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "top"
+              "contents" => [
+                {
+                  "text" => "top"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "top",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -203,17 +211,22 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = 
{
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => " \r\n"
+          "contents" => [
+            {
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => " \r\n"
+                }
+              },
+              "type" => "line_arg"
             }
-          },
-          "type" => "line_arg"
+          ],
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {},
       "source_info" => {
         "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
@@ -221,23 +234,26 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = 
{
       }
     },
     {
-      "args" => [
+      "cmdname" => "chapter",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "CARRIAGE RETURN|\r|"
+              "contents" => [
+                {
+                  "text" => "CARRIAGE RETURN|\r|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "chapter",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -257,17 +273,22 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = 
{
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => " \t\f\n"
+          "contents" => [
+            {
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => " \t\f\n"
+                }
+              },
+              "type" => "line_arg"
             }
-          },
-          "type" => "line_arg"
+          ],
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {},
       "source_info" => {
         "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
@@ -275,23 +296,26 @@ $result_trees{'in_menu_only_special_ascii_spaces_node'} = 
{
       }
     },
     {
-      "args" => [
+      "cmdname" => "chapter",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "CHARACTER TABULATION|\t| FORM FEED|\f|"
+              "contents" => [
+                {
+                  "text" => "CHARACTER TABULATION|\t| FORM FEED|\f|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "chapter",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
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 eb7b872ea3..7a9402b8f6 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
@@ -16,22 +16,27 @@ 
$result_trees{'in_menu_only_special_ascii_spaces_node_menu'} = {
       "type" => "before_node_section"
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "Top"
+              "contents" => [
+                {
+                  "text" => "Top"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {
         "is_target" => 1,
         "normalized" => "Top"
@@ -47,23 +52,26 @@ 
$result_trees{'in_menu_only_special_ascii_spaces_node_menu'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "top",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "top"
+              "contents" => [
+                {
+                  "text" => "top"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "top",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -203,17 +211,22 @@ 
$result_trees{'in_menu_only_special_ascii_spaces_node_menu'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => " \r\n"
+          "contents" => [
+            {
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => " \r\n"
+                }
+              },
+              "type" => "line_arg"
             }
-          },
-          "type" => "line_arg"
+          ],
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {},
       "source_info" => {
         "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
@@ -221,23 +234,26 @@ 
$result_trees{'in_menu_only_special_ascii_spaces_node_menu'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "chapter",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "CARRIAGE RETURN|\r|"
+              "contents" => [
+                {
+                  "text" => "CARRIAGE RETURN|\r|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "chapter",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -257,17 +273,22 @@ 
$result_trees{'in_menu_only_special_ascii_spaces_node_menu'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => " \t\f\n"
+          "contents" => [
+            {
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => " \t\f\n"
+                }
+              },
+              "type" => "line_arg"
             }
-          },
-          "type" => "line_arg"
+          ],
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {},
       "source_info" => {
         "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
@@ -275,23 +296,26 @@ 
$result_trees{'in_menu_only_special_ascii_spaces_node_menu'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "chapter",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "CHARACTER TABULATION|\t| FORM FEED|\f|"
+              "contents" => [
+                {
+                  "text" => "CHARACTER TABULATION|\t| FORM FEED|\f|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "chapter",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
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 dd52fc98ec..7722f9df95 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
@@ -25,22 +25,27 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       "type" => "before_node_section"
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "Top"
+              "contents" => [
+                {
+                  "text" => "Top"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {
         "is_target" => 1,
         "normalized" => "Top"
@@ -56,23 +61,26 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "top",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "top"
+              "contents" => [
+                {
+                  "text" => "top"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "top",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -409,22 +417,27 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "\x{2000}\x{2001}\x{2002}"
+              "contents" => [
+                {
+                  "text" => "\x{2000}\x{2001}\x{2002}"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {
         "is_target" => 1,
         "normalized" => "_2002_2003_2002"
@@ -440,23 +453,26 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "chapter",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "EN QUAD|\x{2000}| EM QUAD|\x{2001}| EN 
SPACE|\x{2002}|"
+              "contents" => [
+                {
+                  "text" => "EN QUAD|\x{2000}| EM QUAD|\x{2001}| EN 
SPACE|\x{2002}|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "chapter",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -476,17 +492,22 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => " \t\f\13\n"
+          "contents" => [
+            {
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => " \t\f\13\n"
+                }
+              },
+              "type" => "line_arg"
             }
-          },
-          "type" => "line_arg"
+          ],
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {},
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
@@ -494,23 +515,26 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "chapter",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "CHARACTER TABULATION|\t| FORM FEED|\f| LINE 
TABULATION|\13|"
+              "contents" => [
+                {
+                  "text" => "CHARACTER TABULATION|\t| FORM FEED|\f| LINE 
TABULATION|\13|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "chapter",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -530,17 +554,22 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => " \r\n"
+          "contents" => [
+            {
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => " \r\n"
+                }
+              },
+              "type" => "line_arg"
             }
-          },
-          "type" => "line_arg"
+          ],
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {},
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
@@ -548,23 +577,26 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "chapter",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "CARRIAGE RETURN|\r|"
+              "contents" => [
+                {
+                  "text" => "CARRIAGE RETURN|\r|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "chapter",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -584,22 +616,27 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "\x{85}\x{a0}\x{1680}"
+              "contents" => [
+                {
+                  "text" => "\x{85}\x{a0}\x{1680}"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {
         "is_target" => 1,
         "normalized" => "_0085_00a0_1680"
@@ -615,23 +652,26 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "chapter",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "NEXT LINE (NEL)|\x{85}| NO-BREAK SPACE|\x{a0}| OGHAM 
SPACE MARK|\x{1680}|"
+              "contents" => [
+                {
+                  "text" => "NEXT LINE (NEL)|\x{85}| NO-BREAK SPACE|\x{a0}| 
OGHAM SPACE MARK|\x{1680}|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "chapter",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -651,22 +691,27 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "\x{180e}\x{2003}"
+              "contents" => [
+                {
+                  "text" => "\x{180e}\x{2003}"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {
         "is_target" => 1,
         "normalized" => "_180e_2003"
@@ -682,23 +727,26 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "chapter",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "MONGOLIAN VOWEL SEPARATOR|\x{180e}| EM 
SPACE|\x{2003}|"
+              "contents" => [
+                {
+                  "text" => "MONGOLIAN VOWEL SEPARATOR|\x{180e}| EM 
SPACE|\x{2003}|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "chapter",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -718,22 +766,27 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => 
"\x{2004}\x{2005}\x{2006}\x{2007}\x{2008}\x{2009}\x{200a}\x{202f}\x{205f}\x{3000}"
+              "contents" => [
+                {
+                  "text" => 
"\x{2004}\x{2005}\x{2006}\x{2007}\x{2008}\x{2009}\x{200a}\x{202f}\x{205f}\x{3000}"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {
         "is_target" => 1,
         "normalized" => "_2004_2005_2006_2007_2008_2009_200a_202f_205f_3000"
@@ -749,23 +802,26 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "chapter",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "THREE-PER-EM SPACE|\x{2004}| FOUR-PER-EM 
SPACE|\x{2005}| SIX-PER-EM SPACE|\x{2006}| FIGURE SPACE|\x{2007}| PUNCTUATION 
SPACE|\x{2008}| THIN SPACE|\x{2009}| HAIR SPACE|\x{200a}| NARROW NO-BREAK 
SPACE|\x{202f}| MEDIUM MATHEMATICAL SPACE|\x{205f}| IDEOGRAPHIC SPACE|\x{3000}|"
+              "contents" => [
+                {
+                  "text" => "THREE-PER-EM SPACE|\x{2004}| FOUR-PER-EM 
SPACE|\x{2005}| SIX-PER-EM SPACE|\x{2006}| FIGURE SPACE|\x{2007}| PUNCTUATION 
SPACE|\x{2008}| THIN SPACE|\x{2009}| HAIR SPACE|\x{200a}| NARROW NO-BREAK 
SPACE|\x{202f}| MEDIUM MATHEMATICAL SPACE|\x{205f}| IDEOGRAPHIC SPACE|\x{3000}|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "chapter",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -827,10 +883,10 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
   ],
   "type" => "document_root"
 };
-$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"contents"}[1]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"contents"}[1]{"contents"}[1]{"contents"}[0];
-$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"contents"}[4]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"contents"}[4]{"contents"}[1]{"contents"}[0];
-$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"contents"}[5]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"contents"}[5]{"contents"}[1]{"contents"}[0];
-$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"contents"}[6]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"contents"}[6]{"contents"}[1]{"contents"}[0];
+$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[2]{"contents"}[1]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[2]{"contents"}[1]{"contents"}[1]{"contents"}[0];
+$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[2]{"contents"}[4]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[2]{"contents"}[4]{"contents"}[1]{"contents"}[0];
+$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[2]{"contents"}[5]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[2]{"contents"}[5]{"contents"}[1]{"contents"}[0];
+$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[2]{"contents"}[6]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[2]{"contents"}[6]{"contents"}[1]{"contents"}[0];
 
 $result_texis{'in_menu_only_special_spaces_node'} = '
 @node Top
diff --git a/tp/t/results/sectioning/in_menu_only_special_spaces_node_menu.pl 
b/tp/t/results/sectioning/in_menu_only_special_spaces_node_menu.pl
index 185c7c0737..817773d755 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
@@ -25,22 +25,27 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       "type" => "before_node_section"
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "Top"
+              "contents" => [
+                {
+                  "text" => "Top"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {
         "is_target" => 1,
         "normalized" => "Top"
@@ -56,23 +61,26 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "top",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "top"
+              "contents" => [
+                {
+                  "text" => "top"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "top",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -409,22 +417,27 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "\x{2000}\x{2001}\x{2002}"
+              "contents" => [
+                {
+                  "text" => "\x{2000}\x{2001}\x{2002}"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {
         "is_target" => 1,
         "normalized" => "_2002_2003_2002"
@@ -440,23 +453,26 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "chapter",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "EN QUAD|\x{2000}| EM QUAD|\x{2001}| EN 
SPACE|\x{2002}|"
+              "contents" => [
+                {
+                  "text" => "EN QUAD|\x{2000}| EM QUAD|\x{2001}| EN 
SPACE|\x{2002}|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "chapter",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -476,17 +492,22 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => " \t\f\13\n"
+          "contents" => [
+            {
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => " \t\f\13\n"
+                }
+              },
+              "type" => "line_arg"
             }
-          },
-          "type" => "line_arg"
+          ],
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {},
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
@@ -494,23 +515,26 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "chapter",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "CHARACTER TABULATION|\t| FORM FEED|\f| LINE 
TABULATION|\13|"
+              "contents" => [
+                {
+                  "text" => "CHARACTER TABULATION|\t| FORM FEED|\f| LINE 
TABULATION|\13|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "chapter",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -530,17 +554,22 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => " \r\n"
+          "contents" => [
+            {
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => " \r\n"
+                }
+              },
+              "type" => "line_arg"
             }
-          },
-          "type" => "line_arg"
+          ],
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {},
       "source_info" => {
         "file_name" => "in_menu_only_special_spaces_node.texi",
@@ -548,23 +577,26 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "chapter",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "CARRIAGE RETURN|\r|"
+              "contents" => [
+                {
+                  "text" => "CARRIAGE RETURN|\r|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "chapter",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -584,22 +616,27 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "\x{85}\x{a0}\x{1680}"
+              "contents" => [
+                {
+                  "text" => "\x{85}\x{a0}\x{1680}"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {
         "is_target" => 1,
         "normalized" => "_0085_00a0_1680"
@@ -615,23 +652,26 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "chapter",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "NEXT LINE (NEL)|\x{85}| NO-BREAK SPACE|\x{a0}| OGHAM 
SPACE MARK|\x{1680}|"
+              "contents" => [
+                {
+                  "text" => "NEXT LINE (NEL)|\x{85}| NO-BREAK SPACE|\x{a0}| 
OGHAM SPACE MARK|\x{1680}|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "chapter",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -651,22 +691,27 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "\x{180e}\x{2003}"
+              "contents" => [
+                {
+                  "text" => "\x{180e}\x{2003}"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {
         "is_target" => 1,
         "normalized" => "_180e_2003"
@@ -682,23 +727,26 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "chapter",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "MONGOLIAN VOWEL SEPARATOR|\x{180e}| EM 
SPACE|\x{2003}|"
+              "contents" => [
+                {
+                  "text" => "MONGOLIAN VOWEL SEPARATOR|\x{180e}| EM 
SPACE|\x{2003}|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "chapter",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -718,22 +766,27 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "node",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => 
"\x{2004}\x{2005}\x{2006}\x{2007}\x{2008}\x{2009}\x{200a}\x{202f}\x{205f}\x{3000}"
+              "contents" => [
+                {
+                  "text" => 
"\x{2004}\x{2005}\x{2006}\x{2007}\x{2008}\x{2009}\x{200a}\x{202f}\x{205f}\x{3000}"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
+          "type" => "argument"
         }
       ],
-      "cmdname" => "node",
       "extra" => {
         "is_target" => 1,
         "normalized" => "_2004_2005_2006_2007_2008_2009_200a_202f_205f_3000"
@@ -749,23 +802,26 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
       }
     },
     {
-      "args" => [
+      "cmdname" => "chapter",
+      "contents" => [
         {
           "contents" => [
             {
-              "text" => "THREE-PER-EM SPACE|\x{2004}| FOUR-PER-EM 
SPACE|\x{2005}| SIX-PER-EM SPACE|\x{2006}| FIGURE SPACE|\x{2007}| PUNCTUATION 
SPACE|\x{2008}| THIN SPACE|\x{2009}| HAIR SPACE|\x{200a}| NARROW NO-BREAK 
SPACE|\x{202f}| MEDIUM MATHEMATICAL SPACE|\x{205f}| IDEOGRAPHIC SPACE|\x{3000}|"
+              "contents" => [
+                {
+                  "text" => "THREE-PER-EM SPACE|\x{2004}| FOUR-PER-EM 
SPACE|\x{2005}| SIX-PER-EM SPACE|\x{2006}| FIGURE SPACE|\x{2007}| PUNCTUATION 
SPACE|\x{2008}| THIN SPACE|\x{2009}| HAIR SPACE|\x{200a}| NARROW NO-BREAK 
SPACE|\x{202f}| MEDIUM MATHEMATICAL SPACE|\x{205f}| IDEOGRAPHIC SPACE|\x{3000}|"
+                }
+              ],
+              "info" => {
+                "spaces_after_argument" => {
+                  "text" => "\n"
+                }
+              },
+              "type" => "line_arg"
             }
           ],
-          "info" => {
-            "spaces_after_argument" => {
-              "text" => "\n"
-            }
-          },
-          "type" => "line_arg"
-        }
-      ],
-      "cmdname" => "chapter",
-      "contents" => [
+          "type" => "argument"
+        },
         {
           "text" => "\n",
           "type" => "empty_line"
@@ -827,10 +883,10 @@ $result_trees{'in_menu_only_special_spaces_node_menu'} = {
   ],
   "type" => "document_root"
 };
-$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[1]{"contents"}[1]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[1]{"contents"}[1]{"contents"}[1]{"contents"}[0];
-$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[1]{"contents"}[4]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[1]{"contents"}[4]{"contents"}[1]{"contents"}[0];
-$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[1]{"contents"}[5]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[1]{"contents"}[5]{"contents"}[1]{"contents"}[0];
-$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[1]{"contents"}[6]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[1]{"contents"}[6]{"contents"}[1]{"contents"}[0];
+$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[2]{"contents"}[1]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[2]{"contents"}[1]{"contents"}[1]{"contents"}[0];
+$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[2]{"contents"}[4]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[2]{"contents"}[4]{"contents"}[1]{"contents"}[0];
+$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[2]{"contents"}[5]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[2]{"contents"}[5]{"contents"}[1]{"contents"}[0];
+$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[2]{"contents"}[6]{"contents"}[1]{"extra"}{"node_content"}{"contents"}[0]
 = 
$result_trees{'in_menu_only_special_spaces_node_menu'}{"contents"}[2]{"contents"}[2]{"contents"}[6]{"contents"}[1]{"contents"}[0];
 
 $result_texis{'in_menu_only_special_spaces_node_menu'} = '
 @node Top
diff --git a/tp/t/results/sectioning/lone_Top_node.pl 
b/tp/t/results/sectioning/lone_Top_node.pl
index 622b584944..138e81bc0d 100644
--- a/tp/t/results/sectioning/lone_Top_node.pl
+++ b/tp/t/results/sectioning/lone_Top_node.pl
@@ -8,23 +8,28 @@ use utf8;
 $result_trees{'lone_Top_node'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
@@ -47,24 +52,27 @@ $result_trees{'lone_Top_node'} = [
         'type' => 'before_node_section'
       },
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'node',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -188,23 +196,28 @@ $result_trees{'lone_Top_node'} = [
         }
       },
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'First'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'First'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'First'
@@ -223,7 +236,7 @@ $result_trees{'lone_Top_node'} = [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'lone_Top_node'}[0]{'unit_contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'lone_Top_node'}[0]{'unit_contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'lone_Top_node'}[0]{'unit_contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'lone_Top_node'}[0]{'unit_contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 $result_trees{'lone_Top_node'}[0]{'unit_contents'}[3] = 
$result_trees{'lone_Top_node'}[0]{'unit_command'};
 
 $result_texis{'lone_Top_node'} = '@node Top
diff --git a/tp/t/results/sectioning/loop_nodes.pl 
b/tp/t/results/sectioning/loop_nodes.pl
index 48d497963a..056081b43e 100644
--- a/tp/t/results/sectioning/loop_nodes.pl
+++ b/tp/t/results/sectioning/loop_nodes.pl
@@ -16,23 +16,28 @@ $result_trees{'loop_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'loop_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -185,46 +193,49 @@ $result_trees{'loop_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chap node up'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node down'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chap node up'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'node-down'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'node down'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'node-down'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -348,46 +359,49 @@ $result_trees{'loop_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'node middle'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap node up'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'node middle'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'chap-node-up'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'chap node up'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'chap-node-up'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -511,23 +525,28 @@ $result_trees{'loop_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node down'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node down'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-down'
@@ -544,11 +563,11 @@ $result_trees{'loop_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'loop_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'loop_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'loop_nodes'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'loop_nodes'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-$result_trees{'loop_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'loop_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'loop_nodes'}{'contents'}[4]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'loop_nodes'}{'contents'}[4]{'args'}[3]{'contents'}[0];
-$result_trees{'loop_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'loop_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'loop_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'loop_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'loop_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'loop_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'loop_nodes'}{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'loop_nodes'}{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'loop_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'loop_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'loop_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'loop_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'loop_nodes'} = '@node Top
 @top top
diff --git a/tp/t/results/sectioning/menutextorder.pl 
b/tp/t/results/sectioning/menutextorder.pl
index 461c2726c8..772df1f178 100644
--- a/tp/t/results/sectioning/menutextorder.pl
+++ b/tp/t/results/sectioning/menutextorder.pl
@@ -162,23 +162,28 @@ $result_trees{'menutextorder'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'bar'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'bar'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'bar'
@@ -193,24 +198,27 @@ $result_trees{'menutextorder'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'bar'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'bar'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -333,23 +341,28 @@ $result_trees{'menutextorder'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'onesub1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'onesub1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'onesub1'
@@ -364,24 +377,27 @@ $result_trees{'menutextorder'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'One sub 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'One sub 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -401,23 +417,28 @@ $result_trees{'menutextorder'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'onesub2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'onesub2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'onesub2'
@@ -432,24 +453,27 @@ $result_trees{'menutextorder'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'One sub 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'One sub 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -474,23 +498,28 @@ $result_trees{'menutextorder'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'foo'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'foo'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'foo'
@@ -505,24 +534,27 @@ $result_trees{'menutextorder'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'foo'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'foo'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -737,23 +769,28 @@ $result_trees{'menutextorder'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sub1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sub1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sub1'
@@ -768,24 +805,27 @@ $result_trees{'menutextorder'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sub1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sub1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -805,23 +845,28 @@ $result_trees{'menutextorder'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sub2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sub2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sub2'
@@ -836,24 +881,27 @@ $result_trees{'menutextorder'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sub2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sub2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -873,23 +921,28 @@ $result_trees{'menutextorder'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sub3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sub3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sub3'
@@ -904,23 +957,28 @@ $result_trees{'menutextorder'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sub3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sub3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {
         'section_number' => '2.3'
       },
@@ -938,10 +996,10 @@ $result_trees{'menutextorder'} = {
 };
 
$result_trees{'menutextorder'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'menutextorder'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'menutextorder'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'menutextorder'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'menutextorder'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'menutextorder'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'menutextorder'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'menutextorder'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'menutextorder'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'menutextorder'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'menutextorder'}{'contents'}[8]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'menutextorder'}{'contents'}[8]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'menutextorder'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'menutextorder'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'menutextorder'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'menutextorder'}{'contents'}[8]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'menutextorder'}{'contents'}[8]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'menutextorder'}{'contents'}[8]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'menutextorder'}{'contents'}[8]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'menutextorder'}{'contents'}[8]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'menutextorder'} = '@menu
 * foo::
diff --git a/tp/t/results/sectioning/next_in_menu_is_below.pl 
b/tp/t/results/sectioning/next_in_menu_is_below.pl
index 88910f5e66..3d8541bd36 100644
--- a/tp/t/results/sectioning/next_in_menu_is_below.pl
+++ b/tp/t/results/sectioning/next_in_menu_is_below.pl
@@ -11,23 +11,28 @@ $result_trees{'next_in_menu_is_below'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'next_in_menu_is_below'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -180,23 +188,28 @@ $result_trees{'next_in_menu_is_below'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -211,24 +224,27 @@ $result_trees{'next_in_menu_is_below'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -397,23 +413,28 @@ $result_trees{'next_in_menu_is_below'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -428,24 +449,27 @@ $result_trees{'next_in_menu_is_below'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -568,23 +592,28 @@ $result_trees{'next_in_menu_is_below'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'subsection'
@@ -599,23 +628,28 @@ $result_trees{'next_in_menu_is_below'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'subsection',
       'extra' => {
         'section_number' => '1.1.1'
       },
@@ -631,10 +665,10 @@ $result_trees{'next_in_menu_is_below'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'next_in_menu_is_below'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'next_in_menu_is_below'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[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'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'next_in_menu_is_below'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'next_in_menu_is_below'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'next_in_menu_is_below'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'next_in_menu_is_below'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'next_in_menu_is_below'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'next_in_menu_is_below'} = '@node Top
 @top top
diff --git a/tp/t/results/sectioning/next_no_prev_to_node.pl 
b/tp/t/results/sectioning/next_no_prev_to_node.pl
index 2c1797a315..f7f55186ca 100644
--- a/tp/t/results/sectioning/next_no_prev_to_node.pl
+++ b/tp/t/results/sectioning/next_no_prev_to_node.pl
@@ -11,24 +11,27 @@ $result_trees{'next_no_prev_to_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -198,67 +201,70 @@ $result_trees{'next_no_prev_to_node'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chap first node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'no return'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chap first node'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'no-return'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'no return'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'no-return'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
+            {
+              'type' => 'line_arg'
             },
-            'spaces_before_argument' => {
-              'text' => ' '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -279,48 +285,53 @@ $result_trees{'next_no_prev_to_node'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'no return'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'no return'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => ' 
-'
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'spaces_before_argument' => {
-              'text' => ' '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => ' 
+'
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'no-return'
@@ -337,11 +348,11 @@ $result_trees{'next_no_prev_to_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'next_no_prev_to_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'next_no_prev_to_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'next_no_prev_to_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'next_no_prev_to_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'next_no_prev_to_node'}{'contents'}[2]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'next_no_prev_to_node'}{'contents'}[2]{'args'}[1]{'contents'}[0];
-$result_trees{'next_no_prev_to_node'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'next_no_prev_to_node'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'next_no_prev_to_node'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'next_no_prev_to_node'}{'contents'}[3]{'args'}[3]{'contents'}[0];
+$result_trees{'next_no_prev_to_node'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'next_no_prev_to_node'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'next_no_prev_to_node'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'next_no_prev_to_node'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'next_no_prev_to_node'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'next_no_prev_to_node'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'next_no_prev_to_node'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'next_no_prev_to_node'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'next_no_prev_to_node'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'next_no_prev_to_node'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'next_no_prev_to_node'} = '@node Top
 
diff --git a/tp/t/results/sectioning/no_argument_and_contents.pl 
b/tp/t/results/sectioning/no_argument_and_contents.pl
index 6fb84c75df..cc9d78fa1d 100644
--- a/tp/t/results/sectioning/no_argument_and_contents.pl
+++ b/tp/t/results/sectioning/no_argument_and_contents.pl
@@ -37,24 +37,27 @@ $result_trees{'no_argument_and_contents'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'for example'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'for example'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -72,32 +75,35 @@ $result_trees{'no_argument_and_contents'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'asis',
               'contents' => [
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'asis',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 5
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 5
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/sectioning/no_menu.pl 
b/tp/t/results/sectioning/no_menu.pl
index 4e78f2de8c..de7c11bbe0 100644
--- a/tp/t/results/sectioning/no_menu.pl
+++ b/tp/t/results/sectioning/no_menu.pl
@@ -11,23 +11,28 @@ $result_trees{'no_menu'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,19 +47,22 @@ $result_trees{'no_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -67,23 +75,28 @@ $result_trees{'no_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'c1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'c1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'c1'
@@ -98,24 +111,27 @@ $result_trees{'no_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'c1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'c1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -135,23 +151,28 @@ $result_trees{'no_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'c2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'c2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'c2'
@@ -166,24 +187,27 @@ $result_trees{'no_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'c2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'c2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -203,23 +227,28 @@ $result_trees{'no_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'c3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'c3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'c3'
@@ -234,23 +263,28 @@ $result_trees{'no_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'c3'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'c3'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '3'
       },
diff --git a/tp/t/results/sectioning/node_empty_direction.pl 
b/tp/t/results/sectioning/node_empty_direction.pl
index cae23d031c..85d2c01f95 100644
--- a/tp/t/results/sectioning/node_empty_direction.pl
+++ b/tp/t/results/sectioning/node_empty_direction.pl
@@ -11,25 +11,30 @@ $result_trees{'node_empty_direction'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'name'
+              'contents' => [
+                {
+                  'text' => 'name'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
           ],
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'name'
diff --git a/tp/t/results/sectioning/node_line_arguments.pl 
b/tp/t/results/sectioning/node_line_arguments.pl
index bd86e44ccd..9d1062554a 100644
--- a/tp/t/results/sectioning/node_line_arguments.pl
+++ b/tp/t/results/sectioning/node_line_arguments.pl
@@ -18,23 +18,28 @@ $result_trees{'node_line_arguments'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'one arg1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => ' 
+              'contents' => [
+                {
+                  'text' => 'one arg1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => ' 
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'one-arg1'
@@ -49,42 +54,47 @@ $result_trees{'node_line_arguments'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'one arg2'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'two arg'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'one arg2'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'two-arg'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'two arg'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'two-arg'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'one-arg2'
@@ -99,63 +109,68 @@ $result_trees{'node_line_arguments'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'one arg3'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'two arg'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'one arg3'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'two-arg'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'three arg'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'two arg'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'two-arg'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'three-arg'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'three arg'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'three-arg'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'one-arg3'
@@ -170,84 +185,89 @@ $result_trees{'node_line_arguments'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'one arg4'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'two arg'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'one arg4'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'two-arg'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'three arg'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'two arg'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'two-arg'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'three-arg'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'four arg'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'three arg'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'three-arg'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'four-arg'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'four arg'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'four-arg'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'one-arg4'
@@ -262,85 +282,88 @@ $result_trees{'node_line_arguments'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'one arg5'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'two arg'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'one arg5'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'two-arg'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'three arg'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'two arg'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'two-arg'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'three-arg'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'four arg five arg'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'three arg'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'three-arg'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'four-arg-five-arg'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'four arg five arg'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'four-arg-five-arg'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -361,33 +384,36 @@ $result_trees{'node_line_arguments'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'comment'
-            }
-          ],
-          'info' => {
-            'comment_at_end' => {
-              'args' => [
+              'contents' => [
                 {
-                  'text' => '
-',
-                  'type' => 'rawline_arg'
+                  'text' => 'comment'
                 }
               ],
-              'cmdname' => 'comment'
-            },
-            'spaces_after_argument' => {
-              'text' => ' '
+              'info' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'text' => '
+',
+                      'type' => 'rawline_arg'
+                    }
+                  ],
+                  'cmdname' => 'comment'
+                },
+                'spaces_after_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -408,116 +434,121 @@ $result_trees{'node_line_arguments'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'arg1 '
-            },
-            {
-              'cmdname' => 'comma',
               'contents' => [
                 {
-                  'type' => 'brace_container'
+                  'text' => 'arg1 '
+                },
+                {
+                  'cmdname' => 'comma',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 10
+                  }
+                },
+                {
+                  'text' => ' arg2'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 10
-              }
+              'type' => 'line_arg'
             },
             {
-              'text' => ' arg2'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'cmdname' => ',',
               'contents' => [
                 {
+                  'cmdname' => ',',
                   'contents' => [
                     {
-                      'text' => 'c'
+                      'contents' => [
+                        {
+                          'text' => 'c'
+                        }
+                      ],
+                      'type' => 'following_arg'
                     }
                   ],
-                  'type' => 'following_arg'
+                  'source_info' => {
+                    'line_nr' => 10
+                  }
+                },
+                {
+                  'text' => 'edilla'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 10
-              }
-            },
-            {
-              'text' => 'edilla'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
-              'contents' => [
-                {},
-                {}
-              ]
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {},
+                    {}
+                  ]
+                },
+                'normalized' => '_00e7edilla'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => '_00e7edilla'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'cmdname' => 'strong',
               'contents' => [
                 {
+                  'cmdname' => 'strong',
                   'contents' => [
                     {
-                      'text' => 'comma in strong,'
+                      'contents' => [
+                        {
+                          'text' => 'comma in strong,'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 10
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 10
-              }
-            }
-          ],
-          'extra' => {
-            'node_content' => {
-              'contents' => [
-                {}
-              ]
-            },
-            'normalized' => 'comma-in-strong_002c'
-          },
-          'info' => {
-            'comment_at_end' => {
-              'args' => [
-                {
-                  'text' => ' comma , end
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'comma-in-strong_002c'
+              },
+              'info' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'text' => ' comma , end
 ',
-                  'type' => 'rawline_arg'
+                      'type' => 'rawline_arg'
+                    }
+                  ],
+                  'cmdname' => 'c'
+                },
+                'spaces_after_argument' => {
+                  'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
                 }
-              ],
-              'cmdname' => 'c'
-            },
-            'spaces_after_argument' => {
-              'text' => ' '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'arg1-_002c-arg2'
@@ -534,18 +565,18 @@ $result_trees{'node_line_arguments'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'node_line_arguments'}{'contents'}[2]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[2]{'args'}[1]{'contents'}[0];
-$result_trees{'node_line_arguments'}{'contents'}[3]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[3]{'args'}[1]{'contents'}[0];
-$result_trees{'node_line_arguments'}{'contents'}[3]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'node_line_arguments'}{'contents'}[4]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[4]{'args'}[1]{'contents'}[0];
-$result_trees{'node_line_arguments'}{'contents'}[4]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[4]{'args'}[2]{'contents'}[0];
-$result_trees{'node_line_arguments'}{'contents'}[4]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[4]{'args'}[3]{'contents'}[0];
-$result_trees{'node_line_arguments'}{'contents'}[5]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[5]{'args'}[1]{'contents'}[0];
-$result_trees{'node_line_arguments'}{'contents'}[5]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[5]{'args'}[2]{'contents'}[0];
-$result_trees{'node_line_arguments'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[5]{'args'}[3]{'contents'}[0];
-$result_trees{'node_line_arguments'}{'contents'}[7]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[7]{'args'}[1]{'contents'}[0];
-$result_trees{'node_line_arguments'}{'contents'}[7]{'args'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'node_line_arguments'}{'contents'}[7]{'args'}[1]{'contents'}[1];
-$result_trees{'node_line_arguments'}{'contents'}[7]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[7]{'args'}[2]{'contents'}[0];
+$result_trees{'node_line_arguments'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_line_arguments'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_line_arguments'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'node_line_arguments'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_line_arguments'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'node_line_arguments'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'node_line_arguments'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_line_arguments'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'node_line_arguments'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'node_line_arguments'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_line_arguments'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'node_line_arguments'}{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'node_line_arguments'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_line_arguments'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
 $result_texis{'node_line_arguments'} = '
 @node one arg1 
diff --git a/tp/t/results/sectioning/node_nested_parentheses.pl 
b/tp/t/results/sectioning/node_nested_parentheses.pl
index 77768240df..cb7a868097 100644
--- a/tp/t/results/sectioning/node_nested_parentheses.pl
+++ b/tp/t/results/sectioning/node_nested_parentheses.pl
@@ -11,24 +11,27 @@ $result_trees{'node_nested_parentheses'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -357,14 +360,14 @@ $result_trees{'node_nested_parentheses'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
-$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1];
-$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[4];
-$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1];
-$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[2];
+$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[3];
+$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1];
+$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[4];
+$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1];
+$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[2]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[2];
 
 $result_texis{'node_nested_parentheses'} = '@node first
 
diff --git a/tp/t/results/sectioning/node_part_chapter_after_chapter.pl 
b/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
index fee155f3d6..45105792a6 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'node_part_chapter_after_chapter'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -196,23 +199,28 @@ $result_trees{'node_part_chapter_after_chapter'} = [
         'type' => 'before_node_section'
       },
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'Top'
@@ -232,24 +240,27 @@ $result_trees{'node_part_chapter_after_chapter'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -270,24 +281,27 @@ $result_trees{'node_part_chapter_after_chapter'} = [
     },
     'unit_contents' => [
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'chapter node'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'chapter node'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'node',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -313,24 +327,27 @@ $result_trees{'node_part_chapter_after_chapter'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter with part node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter with part node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -353,24 +370,27 @@ $result_trees{'node_part_chapter_after_chapter'} = [
       ],
       'extra' => {
         'associated_part' => {
-          'args' => [
+          'cmdname' => 'part',
+          'contents' => [
             {
               'contents' => [
                 {
-                  'text' => 'part'
-                }
-              ],
-              'info' => {
-                'spaces_after_argument' => {
-                  'text' => '
+                  'contents' => [
+                    {
+                      'text' => 'part'
+                    }
+                  ],
+                  'info' => {
+                    'spaces_after_argument' => {
+                      'text' => '
 '
+                    }
+                  },
+                  'type' => 'line_arg'
                 }
-              },
-              'type' => 'line_arg'
-            }
-          ],
-          'cmdname' => 'part',
-          'contents' => [
+              ],
+              'type' => 'argument'
+            },
             {
               'text' => '
 ',
@@ -400,23 +420,28 @@ $result_trees{'node_part_chapter_after_chapter'} = [
     },
     'unit_contents' => [
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'part chapter node'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'part chapter node'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'part-chapter-node'
@@ -436,8 +461,8 @@ $result_trees{'node_part_chapter_after_chapter'} = [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'node_part_chapter_after_chapter'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_part_chapter_after_chapter'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_part_chapter_after_chapter'}[0]{'unit_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_part_chapter_after_chapter'}[0]{'unit_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_part_chapter_after_chapter'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_part_chapter_after_chapter'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_part_chapter_after_chapter'}[0]{'unit_command'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_part_chapter_after_chapter'}[0]{'unit_command'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 $result_trees{'node_part_chapter_after_chapter'}[0]{'unit_contents'}[2] = 
$result_trees{'node_part_chapter_after_chapter'}[0]{'unit_command'};
 $result_trees{'node_part_chapter_after_chapter'}[1]{'unit_contents'}[1] = 
$result_trees{'node_part_chapter_after_chapter'}[1]{'unit_command'};
 $result_trees{'node_part_chapter_after_chapter'}[2]{'unit_contents'}[1] = 
$result_trees{'node_part_chapter_after_chapter'}[2]{'unit_command'}{'extra'}{'associated_part'};
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 d6c2bde12a..a3198df9dc 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_top.pl
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'node_part_chapter_after_top'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -150,23 +153,28 @@ $result_trees{'node_part_chapter_after_top'} = [
         'type' => 'before_node_section'
       },
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'Top'
@@ -186,43 +194,51 @@ $result_trees{'node_part_chapter_after_top'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
-            {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => ' 
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'extra' => {
-        'associated_part' => {
-          'args' => [
             {
               'contents' => [
                 {
-                  'text' => 'part'
+                  'text' => 'chapter'
                 }
               ],
               'info' => {
                 'spaces_after_argument' => {
-                  'text' => '
+                  'text' => ' 
 '
                 }
               },
               'type' => 'line_arg'
             }
           ],
+          'type' => 'argument'
+        }
+      ],
+      'extra' => {
+        'associated_part' => {
           'cmdname' => 'part',
           'contents' => [
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'text' => 'part'
+                    }
+                  ],
+                  'info' => {
+                    'spaces_after_argument' => {
+                      'text' => '
+'
+                    }
+                  },
+                  'type' => 'line_arg'
+                }
+              ],
+              'type' => 'argument'
+            },
             {
               'text' => '
 ',
@@ -252,23 +268,28 @@ $result_trees{'node_part_chapter_after_top'} = [
     },
     'unit_contents' => [
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'chapter node'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'chapter node'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'chapter-node'
@@ -288,7 +309,7 @@ $result_trees{'node_part_chapter_after_top'} = [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'node_part_chapter_after_top'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_part_chapter_after_top'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_part_chapter_after_top'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_part_chapter_after_top'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 $result_trees{'node_part_chapter_after_top'}[0]{'unit_contents'}[2] = 
$result_trees{'node_part_chapter_after_top'}[0]{'unit_command'};
 $result_trees{'node_part_chapter_after_top'}[1]{'unit_contents'}[1] = 
$result_trees{'node_part_chapter_after_top'}[1]{'unit_command'}{'extra'}{'associated_part'};
 $result_trees{'node_part_chapter_after_top'}[1]{'unit_contents'}[2] = 
$result_trees{'node_part_chapter_after_top'}[1]{'unit_command'};
diff --git a/tp/t/results/sectioning/node_referenced_in_ref.pl 
b/tp/t/results/sectioning/node_referenced_in_ref.pl
index b1b2c1019e..c93457a71d 100644
--- a/tp/t/results/sectioning/node_referenced_in_ref.pl
+++ b/tp/t/results/sectioning/node_referenced_in_ref.pl
@@ -11,24 +11,27 @@ $result_trees{'node_referenced_in_ref'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -190,24 +193,27 @@ $result_trees{'node_referenced_in_ref'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap first level node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap first level node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -228,23 +234,28 @@ $result_trees{'node_referenced_in_ref'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second level node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'second level node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'second-level-node'
@@ -261,8 +272,8 @@ $result_trees{'node_referenced_in_ref'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'node_referenced_in_ref'} = '@node Top
 
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 33bd71bb7b..6689ab98ad 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
@@ -16,23 +16,28 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'node_sectop_before_chapter_no_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
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 f186fd38f3..c9c8894dbd 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
@@ -16,23 +16,28 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node before'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node before'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-before'
@@ -47,24 +52,27 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top sectionning'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top sectionning'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -96,24 +104,27 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -148,23 +159,28 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -179,24 +195,27 @@ $result_trees{'node_sectop_before_lone_node_Top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/sectioning/node_simple.pl 
b/tp/t/results/sectioning/node_simple.pl
index bf17646d8a..60d46b5286 100644
--- a/tp/t/results/sectioning/node_simple.pl
+++ b/tp/t/results/sectioning/node_simple.pl
@@ -11,17 +11,22 @@ $result_trees{'node_simple'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'type' => 'line_arg'
             }
           ],
-          'type' => 'line_arg'
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'first'
diff --git a/tp/t/results/sectioning/node_too_much_args.pl 
b/tp/t/results/sectioning/node_too_much_args.pl
index ef02d02cf5..2c335182a3 100644
--- a/tp/t/results/sectioning/node_too_much_args.pl
+++ b/tp/t/results/sectioning/node_too_much_args.pl
@@ -11,59 +11,64 @@ $result_trees{'node_too_much_args'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'type' => 'line_arg'
+            },
             {
-              'text' => '('
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => 'dir'
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => '  '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => '  '
-            }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'first'
@@ -80,7 +85,7 @@ $result_trees{'node_too_much_args'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'node_too_much_args'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = $result_trees{'node_too_much_args'}{'contents'}[1]{'args'}[3]{'contents'}[1];
+$result_trees{'node_too_much_args'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'node_too_much_args'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
 $result_texis{'node_too_much_args'} = '@node first, , ,  (dir)';
 
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 711d5086fd..a2d142b189 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
@@ -11,59 +11,64 @@ $result_trees{'node_up_direction_for_top_with_manual'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'Top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '('
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'type' => 'line_arg'
             },
             {
-              'text' => 'dir'
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
+              'type' => 'line_arg'
             },
             {
-              'text' => 'top'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            },
-            'node_content' => {
-              'contents' => [
-                {}
-              ]
-            },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                },
+                {
+                  'text' => 'top'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -80,8 +85,8 @@ $result_trees{'node_up_direction_for_top_with_manual'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'node_up_direction_for_top_with_manual'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}{'contents'}[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]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_up_direction_for_top_with_manual'}{'contents'}[1]{'args'}[3]{'contents'}[3];
+$result_trees{'node_up_direction_for_top_with_manual'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'node_up_direction_for_top_with_manual'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'node_up_direction_for_top_with_manual'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_up_direction_for_top_with_manual'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[3];
 
 $result_texis{'node_up_direction_for_top_with_manual'} = '@node Top,,,(dir)top
 ';
diff --git a/tp/t/results/sectioning/node_up_external_node.pl 
b/tp/t/results/sectioning/node_up_external_node.pl
index 0cfd2f0ad0..4018fe2559 100644
--- a/tp/t/results/sectioning/node_up_external_node.pl
+++ b/tp/t/results/sectioning/node_up_external_node.pl
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'node_up_external_node'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -163,102 +166,107 @@ $result_trees{'node_up_external_node'} = [
   },
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chap first'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '('
-            },
-            {
-              'text' => 'manual1'
-            },
-            {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
-            },
-            {
-              'text' => 'manual2'
+                {
+                  'text' => 'chap first'
+                }
+              ],
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => ' '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'manual1'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => 'manual3'
+              'contents' => [
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'manual2'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'manual3'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap-first'
@@ -278,11 +286,11 @@ $result_trees{'node_up_external_node'} = [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'node_up_external_node'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_up_external_node'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'node_up_external_node'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'node_up_external_node'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 $result_trees{'node_up_external_node'}[0]{'unit_contents'}[1] = 
$result_trees{'node_up_external_node'}[0]{'unit_command'};
-$result_trees{'node_up_external_node'}[1]{'unit_command'}{'args'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'node_up_external_node'}[1]{'unit_command'}{'args'}[1]{'contents'}[1];
-$result_trees{'node_up_external_node'}[1]{'unit_command'}{'args'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'node_up_external_node'}[1]{'unit_command'}{'args'}[2]{'contents'}[1];
-$result_trees{'node_up_external_node'}[1]{'unit_command'}{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'node_up_external_node'}[1]{'unit_command'}{'args'}[3]{'contents'}[1];
+$result_trees{'node_up_external_node'}[1]{'unit_command'}{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'node_up_external_node'}[1]{'unit_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'node_up_external_node'}[1]{'unit_command'}{'contents'}[0]{'contents'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'node_up_external_node'}[1]{'unit_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'node_up_external_node'}[1]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'node_up_external_node'}[1]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 $result_trees{'node_up_external_node'}[1]{'unit_contents'}[0] = 
$result_trees{'node_up_external_node'}[1]{'unit_command'};
 
 $result_texis{'node_up_external_node'} = '@node Top
diff --git a/tp/t/results/sectioning/nodename_parentheses.pl 
b/tp/t/results/sectioning/nodename_parentheses.pl
index 4c6dd1cdb5..836ee30626 100644
--- a/tp/t/results/sectioning/nodename_parentheses.pl
+++ b/tp/t/results/sectioning/nodename_parentheses.pl
@@ -11,23 +11,28 @@ $result_trees{'nodename_parentheses'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'nodename_parentheses'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'The top node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'The top node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -286,23 +294,28 @@ $result_trees{'nodename_parentheses'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Node (with parentheses)'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Node (with parentheses)'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Node-_0028with-parentheses_0029'
@@ -317,24 +330,27 @@ $result_trees{'nodename_parentheses'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section (nodename with parentheses)'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section (nodename with parentheses)'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -368,23 +384,28 @@ $result_trees{'nodename_parentheses'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Other node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Other node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Other-node'
@@ -399,24 +420,27 @@ $result_trees{'nodename_parentheses'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section (nodename without parentheses)'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section (nodename without parentheses)'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -531,23 +555,28 @@ $result_trees{'nodename_parentheses'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '(manual)node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => '(manual)node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_0028manual_0029node'
@@ -562,24 +591,27 @@ $result_trees{'nodename_parentheses'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '(manual)node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => '(manual)node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -649,13 +681,13 @@ $result_trees{'nodename_parentheses'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1];
-$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[3];
-$result_trees{'nodename_parentheses'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'nodename_parentheses'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'nodename_parentheses'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[3];
+$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1];
+$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[3];
+$result_trees{'nodename_parentheses'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'nodename_parentheses'}{'contents'}[6]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[6]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1];
+$result_trees{'nodename_parentheses'}{'contents'}[6]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[6]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[3];
 
 $result_texis{'nodename_parentheses'} = '@node Top
 @top The top node
diff --git 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_no_use_nodes_chapter.pl
 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_no_use_nodes_chapter.pl
index 2b62c7c8e7..c73dd7de46 100644
--- 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_no_use_nodes_chapter.pl
+++ 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_no_use_nodes_chapter.pl
@@ -16,24 +16,27 @@ 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -207,77 +210,80 @@ 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'second node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'third node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'second node'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'third-node'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'third node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'third-node'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -312,58 +318,63 @@ 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'third node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'third node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'second-node'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'second node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'second-node'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'third-node'
@@ -378,23 +389,28 @@ 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
@@ -410,13 +426,13 @@ 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'}{'contents'}[2]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'}{'contents'}[2]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'}{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'}{'contents'}[2]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'}{'contents'}[3]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'}{'contents'}[3]{'args'}[3]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_no_use_nodes_chapter'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'nodes_after_top_before_chapter_no_use_nodes_chapter'} = '@node 
Top
 Top node
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 f99af81b97..38f7f53f08 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
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'nodes_after_top_before_chapter_nodes'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -208,77 +211,80 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
   },
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'second node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'third node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'second node'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'third-node'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'third node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'third-node'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -319,58 +325,63 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
   },
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'third node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'third node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'second-node'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'second node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'second-node'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'third-node'
@@ -387,23 +398,28 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'chapter',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'chapter'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'chapter'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'chapter',
         'extra' => {
           'section_number' => '1'
         },
@@ -420,15 +436,15 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'unit_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'unit_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'unit_command'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'unit_command'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 $result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'unit_contents'}[1] = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'unit_command'};
-$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'unit_command'}{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'unit_command'}{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'unit_command'}{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'unit_command'}{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'unit_command'}{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'unit_command'}{'args'}[3]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'unit_command'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'unit_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'unit_command'}{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'unit_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'unit_contents'}[0] = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'unit_command'};
-$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'unit_command'}{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'unit_command'}{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'unit_command'}{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'unit_command'}{'args'}[3]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'unit_command'}{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'unit_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'unit_contents'}[0] = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'unit_command'};
 
 $result_texis{'nodes_after_top_before_chapter_nodes'} = '@node Top
diff --git 
a/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split.pl 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_not_split.pl
index 1431fc28b4..d94fa6d7a5 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
@@ -16,24 +16,27 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = 
{
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -207,77 +210,80 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} 
= {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'second node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'third node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'second node'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'third-node'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'third node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'third-node'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -312,58 +318,63 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} 
= {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'third node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'third node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'second-node'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'second node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'second-node'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'third-node'
@@ -378,23 +389,28 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
@@ -410,13 +426,13 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} 
= {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[2]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[2]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[2]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[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]{'args'}[2]{'extra'}{'node_content'}{'contents'}[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]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[3]{'args'}[3]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'nodes_after_top_before_chapter_not_split'} = '@node Top
 Top node
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 49f4cb3e61..adab9d1927 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
@@ -16,24 +16,27 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -207,77 +210,80 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'second node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'third node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'second node'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'third-node'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'third node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'third-node'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -312,58 +318,63 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'third node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'third node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'second-node'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'second node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'second-node'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'third-node'
@@ -378,23 +389,28 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
@@ -410,13 +426,13 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[2]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[2]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[2]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[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]{'args'}[2]{'extra'}{'node_content'}{'contents'}[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]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[3]{'args'}[3]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 
$result_texis{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
 = '@node Top
 Top node
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 5f8a9cfa16..a021124c7a 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
@@ -8,23 +8,28 @@ use utf8;
 $result_trees{'nodes_after_top_before_chapter_sections'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
@@ -42,24 +47,27 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
         'type' => 'before_node_section'
       },
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'node',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'contents' => [
               {
@@ -233,77 +241,80 @@ $result_trees{'nodes_after_top_before_chapter_sections'} 
= [
         }
       },
       {
-        'args' => [
-          {
-            'contents' => [
-              {
-                'text' => 'second node'
-              }
-            ],
-            'type' => 'line_arg'
-          },
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'third node'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'second node'
+                  }
+                ],
+                'type' => 'line_arg'
               },
-              'normalized' => 'third-node'
-            },
-            'info' => {
-              'spaces_before_argument' => {
-                'text' => ' '
-              }
-            },
-            'type' => 'line_arg'
-          },
-          {
-            'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'third node'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'third-node'
+                },
+                'info' => {
+                  'spaces_before_argument' => {
+                    'text' => ' '
+                  }
+                },
+                'type' => 'line_arg'
               },
-              'normalized' => 'Top'
-            },
-            'type' => 'line_arg'
-          },
-          {
-            'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'Top'
+                },
+                'type' => 'line_arg'
               },
-              'normalized' => 'Top'
-            },
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+              {
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'Top'
+                },
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'node',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -338,58 +349,63 @@ $result_trees{'nodes_after_top_before_chapter_sections'} 
= [
         }
       },
       {
-        'args' => [
-          {
-            'contents' => [
-              {
-                'text' => 'third node'
-              }
-            ],
-            'type' => 'line_arg'
-          },
-          {
-            'type' => 'line_arg'
-          },
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'second node'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'third node'
+                  }
+                ],
+                'type' => 'line_arg'
+              },
+              {
+                'type' => 'line_arg'
               },
-              'normalized' => 'second-node'
-            },
-            'type' => 'line_arg'
-          },
-          {
-            'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'second node'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'second-node'
+                },
+                'type' => 'line_arg'
               },
-              'normalized' => 'Top'
-            },
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+              {
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'Top'
+                },
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'third-node'
@@ -408,13 +424,13 @@ $result_trees{'nodes_after_top_before_chapter_sections'} 
= [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'unit_contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'unit_contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'unit_contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'unit_contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'unit_contents'}[2]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'unit_contents'}[2]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'unit_contents'}[2]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'unit_contents'}[2]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'unit_contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'unit_contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'unit_contents'}[3]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'unit_contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'unit_contents'}[3]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'unit_contents'}[3]{'args'}[3]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'unit_contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'unit_contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'unit_contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'unit_contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'unit_contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'unit_contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'unit_contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'unit_contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'unit_contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'unit_contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'unit_contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'unit_contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'unit_contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'unit_contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'unit_contents'}[4] 
= $result_trees{'nodes_after_top_before_chapter_sections'}[0]{'unit_command'};
 
 $result_texis{'nodes_after_top_before_chapter_sections'} = '@node Top
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 6f027da4ce..3d2517b46a 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
@@ -16,24 +16,27 @@ $result_trees{'nodes_after_top_before_chapter_texi2html'} = 
{
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -207,77 +210,80 @@ $result_trees{'nodes_after_top_before_chapter_texi2html'} 
= {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'second node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'third node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'second node'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'third-node'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'third node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'third-node'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -312,58 +318,63 @@ $result_trees{'nodes_after_top_before_chapter_texi2html'} 
= {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'third node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'third node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'second-node'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'second node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'second-node'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'third-node'
@@ -378,23 +389,28 @@ $result_trees{'nodes_after_top_before_chapter_texi2html'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
@@ -410,13 +426,13 @@ $result_trees{'nodes_after_top_before_chapter_texi2html'} 
= {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[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]{'args'}[2]{'extra'}{'node_content'}{'contents'}[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]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[3]{'args'}[3]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'nodes_after_top_before_chapter_texi2html'} = '@node Top
 Top node
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 db38751fd2..ebe9c4a713 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
@@ -16,24 +16,27 @@ 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -207,77 +210,80 @@ 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'second node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'third node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'second node'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'third-node'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'third node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'third-node'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -312,58 +318,63 @@ 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'third node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'third node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'second-node'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'second node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'second-node'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'third-node'
@@ -378,23 +389,28 @@ 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
@@ -410,13 +426,13 @@ 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[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]{'args'}[2]{'extra'}{'node_content'}{'contents'}[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]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[3]{'args'}[3]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} = 
'@node Top
 Top node
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 8bded4fad1..1e2eecbb4c 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
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'nodes_after_top_before_section_nodes'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -208,77 +211,80 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
   },
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chap node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'third node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chap node'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'third-node'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'third node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'third-node'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -319,58 +325,63 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
   },
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'third node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'third node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'chap-node'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chap node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'chap-node'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'third-node'
@@ -387,23 +398,28 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'subsection',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'subsection'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'subsection'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'subsection',
         'extra' => {
           'section_number' => '1'
         },
@@ -420,15 +436,15 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'nodes_after_top_before_section_nodes'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_nodes'}[0]{'unit_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'unit_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_nodes'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_nodes'}[0]{'unit_command'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'unit_command'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 $result_trees{'nodes_after_top_before_section_nodes'}[0]{'unit_contents'}[1] = 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'unit_command'};
-$result_trees{'nodes_after_top_before_section_nodes'}[1]{'unit_command'}{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'unit_command'}{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_nodes'}[1]{'unit_command'}{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'unit_command'}{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_nodes'}[1]{'unit_command'}{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'unit_command'}{'args'}[3]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_nodes'}[1]{'unit_command'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'unit_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_nodes'}[1]{'unit_command'}{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'unit_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_nodes'}[1]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'nodes_after_top_before_section_nodes'}[1]{'unit_contents'}[0] = 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'unit_command'};
-$result_trees{'nodes_after_top_before_section_nodes'}[2]{'unit_command'}{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'unit_command'}{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_nodes'}[2]{'unit_command'}{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'unit_command'}{'args'}[3]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_nodes'}[2]{'unit_command'}{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'unit_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_nodes'}[2]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'nodes_after_top_before_section_nodes'}[2]{'unit_contents'}[0] = 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'unit_command'};
 
 $result_texis{'nodes_after_top_before_section_nodes'} = '@node Top
diff --git a/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl 
b/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl
index b7443b729a..367a4f752e 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
@@ -8,23 +8,28 @@ use utf8;
 $result_trees{'nodes_after_top_before_section_sections'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'subsection',
       'extra' => {
         'section_number' => '1'
       },
@@ -42,24 +47,27 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
         'type' => 'before_node_section'
       },
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'node',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'contents' => [
               {
@@ -233,77 +241,80 @@ $result_trees{'nodes_after_top_before_section_sections'} 
= [
         }
       },
       {
-        'args' => [
-          {
-            'contents' => [
-              {
-                'text' => 'chap node'
-              }
-            ],
-            'type' => 'line_arg'
-          },
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'third node'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'chap node'
+                  }
+                ],
+                'type' => 'line_arg'
               },
-              'normalized' => 'third-node'
-            },
-            'info' => {
-              'spaces_before_argument' => {
-                'text' => ' '
-              }
-            },
-            'type' => 'line_arg'
-          },
-          {
-            'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'third node'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'third-node'
+                },
+                'info' => {
+                  'spaces_before_argument' => {
+                    'text' => ' '
+                  }
+                },
+                'type' => 'line_arg'
               },
-              'normalized' => 'Top'
-            },
-            'type' => 'line_arg'
-          },
-          {
-            'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'Top'
+                },
+                'type' => 'line_arg'
               },
-              'normalized' => 'Top'
-            },
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+              {
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'Top'
+                },
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'node',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -338,58 +349,63 @@ $result_trees{'nodes_after_top_before_section_sections'} 
= [
         }
       },
       {
-        'args' => [
-          {
-            'contents' => [
-              {
-                'text' => 'third node'
-              }
-            ],
-            'type' => 'line_arg'
-          },
-          {
-            'type' => 'line_arg'
-          },
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'chap node'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'third node'
+                  }
+                ],
+                'type' => 'line_arg'
+              },
+              {
+                'type' => 'line_arg'
               },
-              'normalized' => 'chap-node'
-            },
-            'type' => 'line_arg'
-          },
-          {
-            'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'chap node'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'chap-node'
+                },
+                'type' => 'line_arg'
               },
-              'normalized' => 'Top'
-            },
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+              {
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'Top'
+                },
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'third-node'
@@ -408,13 +424,13 @@ $result_trees{'nodes_after_top_before_section_sections'} 
= [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'nodes_after_top_before_section_sections'}[0]{'unit_contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'unit_contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_sections'}[0]{'unit_contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'unit_contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_sections'}[0]{'unit_contents'}[2]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'unit_contents'}[2]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_sections'}[0]{'unit_contents'}[2]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'unit_contents'}[2]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_sections'}[0]{'unit_contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'unit_contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_sections'}[0]{'unit_contents'}[3]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'unit_contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_sections'}[0]{'unit_contents'}[3]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'unit_contents'}[3]{'args'}[3]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_sections'}[0]{'unit_contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'unit_contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_sections'}[0]{'unit_contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'unit_contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_sections'}[0]{'unit_contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'unit_contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_sections'}[0]{'unit_contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'unit_contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_sections'}[0]{'unit_contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'unit_contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_sections'}[0]{'unit_contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'unit_contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_sections'}[0]{'unit_contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'unit_contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'unit_contents'}[4] 
= $result_trees{'nodes_after_top_before_section_sections'}[0]{'unit_command'};
 
 $result_texis{'nodes_after_top_before_section_sections'} = '@node Top
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 631c1adf2b..84c2c0e46a 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
@@ -16,24 +16,27 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -207,77 +210,80 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chap node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'third node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chap node'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'third-node'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'third node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'third-node'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -312,58 +318,63 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'third node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'third node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'chap-node'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chap node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'chap-node'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'third-node'
@@ -378,23 +389,28 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'subsection',
       'extra' => {
         'section_number' => '1'
       },
@@ -410,13 +426,13 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[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]{'args'}[2]{'extra'}{'node_content'}{'contents'}[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]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[3]{'args'}[3]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'nodes_after_top_before_section_texi2html_chapter'} = '@node Top
 Top node
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 65cddcf0ae..e59b234217 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
@@ -16,24 +16,27 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -207,77 +210,80 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chap node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'third node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chap node'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'third-node'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'third node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'third-node'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -312,58 +318,63 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'third node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'third node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'chap-node'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chap node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'chap-node'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'third-node'
@@ -378,23 +389,28 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'subsection',
       'extra' => {
         'section_number' => '1'
       },
@@ -410,13 +426,13 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[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]{'args'}[2]{'extra'}{'node_content'}{'contents'}[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]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[3]{'args'}[3]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'nodes_after_top_before_section_texi2html_use_nodes'} = '@node 
Top
 Top node
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 8f0c9dd7b2..7e8d24d935 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
@@ -16,24 +16,27 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -207,77 +210,80 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chap node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'third node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chap node'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'third-node'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'third node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'third-node'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -312,58 +318,63 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'third node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'third node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'chap-node'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chap node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'chap-node'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'third-node'
@@ -378,23 +389,28 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'subsection',
       'extra' => {
         'section_number' => '1'
       },
@@ -410,13 +426,13 @@ 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[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]{'args'}[2]{'extra'}{'node_content'}{'contents'}[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]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[3]{'args'}[3]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} = 
'@node Top
 Top node
diff --git a/tp/t/results/sectioning/nodes_before_after_top.pl 
b/tp/t/results/sectioning/nodes_before_after_top.pl
index 87cc0f2f83..730ada0bc4 100644
--- a/tp/t/results/sectioning/nodes_before_after_top.pl
+++ b/tp/t/results/sectioning/nodes_before_after_top.pl
@@ -16,24 +16,27 @@ $result_trees{'nodes_before_after_top'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node before'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node before'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -68,23 +71,28 @@ $result_trees{'nodes_before_after_top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -99,24 +107,27 @@ $result_trees{'nodes_before_after_top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top sectionning'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top sectionning'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -148,24 +159,27 @@ $result_trees{'nodes_before_after_top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'after'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'after'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -200,23 +214,28 @@ $result_trees{'nodes_before_after_top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -231,24 +250,27 @@ $result_trees{'nodes_before_after_top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/sectioning/nodes_before_top.pl 
b/tp/t/results/sectioning/nodes_before_top.pl
index 3750e7496e..e3568cad04 100644
--- a/tp/t/results/sectioning/nodes_before_top.pl
+++ b/tp/t/results/sectioning/nodes_before_top.pl
@@ -16,74 +16,77 @@ $result_trees{'nodes_before_top'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'first'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'first'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => '('
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => 'dir'
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -207,46 +210,49 @@ $result_trees{'nodes_before_top'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'node in menu before top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'node in menu before top'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'first'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'first'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -267,42 +273,47 @@ $result_trees{'nodes_before_top'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'Top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'first'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'first'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -317,24 +328,27 @@ $result_trees{'nodes_before_top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => ' 
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => ' 
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -455,23 +469,28 @@ $result_trees{'nodes_before_top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'second node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'second-node'
@@ -486,23 +505,28 @@ $result_trees{'nodes_before_top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'a chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'a chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
@@ -518,12 +542,12 @@ $result_trees{'nodes_before_top'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[3]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'nodes_before_top'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'nodes_before_top'} = '@node first, Top, ,(dir)
 
diff --git a/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl 
b/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
index 6811daec0d..8f07c5f918 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
@@ -8,51 +8,54 @@ use utf8;
 $result_trees{'nodes_no_node_top_explicit_directions'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'type' => 'line_arg'
+            },
             {
-              'text' => '('
+              'type' => 'line_arg'
             },
             {
-              'text' => 'dir'
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -194,59 +197,62 @@ $result_trees{'nodes_no_node_top_explicit_directions'} = [
   },
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'second node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'second node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'first'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'first'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'first'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'first'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'first'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -276,11 +282,11 @@ $result_trees{'nodes_no_node_top_explicit_directions'} = [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'unit_command'}{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'unit_command'}{'args'}[3]{'contents'}[1];
-$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'unit_command'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'unit_command'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 $result_trees{'nodes_no_node_top_explicit_directions'}[0]{'unit_contents'}[1] 
= $result_trees{'nodes_no_node_top_explicit_directions'}[0]{'unit_command'};
-$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'unit_command'}{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'unit_command'}{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'unit_command'}{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'unit_command'}{'args'}[3]{'contents'}[0];
+$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'unit_command'}{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'unit_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'nodes_no_node_top_explicit_directions'}[1]{'unit_contents'}[0] 
= $result_trees{'nodes_no_node_top_explicit_directions'}[1]{'unit_command'};
 
 $result_texis{'nodes_no_node_top_explicit_directions'} = '@node first,,,(dir)
diff --git a/tp/t/results/sectioning/novalidate.pl 
b/tp/t/results/sectioning/novalidate.pl
index 7a9fca345b..0156e6071c 100644
--- a/tp/t/results/sectioning/novalidate.pl
+++ b/tp/t/results/sectioning/novalidate.pl
@@ -36,43 +36,46 @@ $result_trees{'novalidate'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'first'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unknown node'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'first'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'unknown-node'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'unknown node'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'unknown-node'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -231,9 +234,9 @@ $result_trees{'novalidate'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'novalidate'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'novalidate'}{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'novalidate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'novalidate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'novalidate'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'novalidate'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'novalidate'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'novalidate'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'novalidate'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'novalidate'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'novalidate'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'novalidate'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'novalidate'} = '
 @novalidate
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 77b9c11a1c..face8eece1 100644
--- a/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
+++ b/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
@@ -11,51 +11,54 @@ $result_trees{'one_node_explicit_directions_anchor'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'one node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
+              'contents' => [
+                {
+                  'text' => 'one node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
             {
-              'text' => '('
+              'type' => 'line_arg'
             },
             {
-              'text' => 'dir'
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -160,8 +163,8 @@ $result_trees{'one_node_explicit_directions_anchor'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'one_node_explicit_directions_anchor'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'one_node_explicit_directions_anchor'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'one_node_explicit_directions_anchor'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'one_node_explicit_directions_anchor'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'one_node_explicit_directions_anchor'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'one_node_explicit_directions_anchor'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'one_node_explicit_directions_anchor'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'one_node_explicit_directions_anchor'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'one_node_explicit_directions_anchor'} = '@node one node,,,(dir)
 Top node
diff --git 
a/tp/t/results/sectioning/one_node_explicit_directions_anchor_no_use_node.pl 
b/tp/t/results/sectioning/one_node_explicit_directions_anchor_no_use_node.pl
index d35220e00d..a56a1ecca0 100644
--- a/tp/t/results/sectioning/one_node_explicit_directions_anchor_no_use_node.pl
+++ b/tp/t/results/sectioning/one_node_explicit_directions_anchor_no_use_node.pl
@@ -11,51 +11,54 @@ 
$result_trees{'one_node_explicit_directions_anchor_no_use_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'one node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
+              'contents' => [
+                {
+                  'text' => 'one node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
             {
-              'text' => '('
+              'type' => 'line_arg'
             },
             {
-              'text' => 'dir'
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -160,8 +163,8 @@ 
$result_trees{'one_node_explicit_directions_anchor_no_use_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'one_node_explicit_directions_anchor_no_use_node'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'one_node_explicit_directions_anchor_no_use_node'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'one_node_explicit_directions_anchor_no_use_node'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'one_node_explicit_directions_anchor_no_use_node'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'one_node_explicit_directions_anchor_no_use_node'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'one_node_explicit_directions_anchor_no_use_node'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'one_node_explicit_directions_anchor_no_use_node'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'one_node_explicit_directions_anchor_no_use_node'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'one_node_explicit_directions_anchor_no_use_node'} = '@node one 
node,,,(dir)
 Top node
diff --git a/tp/t/results/sectioning/one_subsection.pl 
b/tp/t/results/sectioning/one_subsection.pl
index a09b4869d1..279c2e3b3d 100644
--- a/tp/t/results/sectioning/one_subsection.pl
+++ b/tp/t/results/sectioning/one_subsection.pl
@@ -16,23 +16,28 @@ $result_trees{'one_subsection'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'The subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'The subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'subsection',
       'extra' => {
         'section_number' => '1'
       },
diff --git a/tp/t/results/sectioning/one_subsection_and_node.pl 
b/tp/t/results/sectioning/one_subsection_and_node.pl
index 6840613703..700f8d6385 100644
--- a/tp/t/results/sectioning/one_subsection_and_node.pl
+++ b/tp/t/results/sectioning/one_subsection_and_node.pl
@@ -11,23 +11,28 @@ $result_trees{'one_subsection_and_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'one node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'one node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'one-node'
@@ -42,23 +47,28 @@ $result_trees{'one_subsection_and_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'The subsection'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'The subsection'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'subsection',
       'extra' => {
         'section_number' => '1'
       },
diff --git a/tp/t/results/sectioning/part_before_chapter.pl 
b/tp/t/results/sectioning/part_before_chapter.pl
index 45250ca9e0..ebf700a37a 100644
--- a/tp/t/results/sectioning/part_before_chapter.pl
+++ b/tp/t/results/sectioning/part_before_chapter.pl
@@ -8,30 +8,14 @@ use utf8;
 $result_trees{'part_before_chapter'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
-            {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'extra' => {
-        'associated_part' => {
-          'args' => [
             {
               'contents' => [
                 {
-                  'text' => 'part'
+                  'text' => 'chapter'
                 }
               ],
               'info' => {
@@ -43,8 +27,32 @@ $result_trees{'part_before_chapter'} = [
               'type' => 'line_arg'
             }
           ],
+          'type' => 'argument'
+        }
+      ],
+      'extra' => {
+        'associated_part' => {
           'cmdname' => 'part',
           'contents' => [
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'text' => 'part'
+                    }
+                  ],
+                  'info' => {
+                    'spaces_after_argument' => {
+                      'text' => '
+'
+                    }
+                  },
+                  'type' => 'line_arg'
+                }
+              ],
+              'type' => 'argument'
+            },
             {
               'text' => '
 ',
diff --git a/tp/t/results/sectioning/part_before_section.pl 
b/tp/t/results/sectioning/part_before_section.pl
index da4b8ecc25..47f4fe6aee 100644
--- a/tp/t/results/sectioning/part_before_section.pl
+++ b/tp/t/results/sectioning/part_before_section.pl
@@ -8,43 +8,51 @@ use utf8;
 $result_trees{'part_before_section'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
-            {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => ' 
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'extra' => {
-        'associated_part' => {
-          'args' => [
             {
               'contents' => [
                 {
-                  'text' => 'part'
+                  'text' => 'section'
                 }
               ],
               'info' => {
                 'spaces_after_argument' => {
-                  'text' => '
+                  'text' => ' 
 '
                 }
               },
               'type' => 'line_arg'
             }
           ],
+          'type' => 'argument'
+        }
+      ],
+      'extra' => {
+        'associated_part' => {
           'cmdname' => 'part',
           'contents' => [
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'text' => 'part'
+                    }
+                  ],
+                  'info' => {
+                    'spaces_after_argument' => {
+                      'text' => '
+'
+                    }
+                  },
+                  'type' => 'line_arg'
+                }
+              ],
+              'type' => 'argument'
+            },
             {
               'text' => '
 ',
diff --git a/tp/t/results/sectioning/part_before_top.pl 
b/tp/t/results/sectioning/part_before_top.pl
index 2f834d256b..ebc814637d 100644
--- a/tp/t/results/sectioning/part_before_top.pl
+++ b/tp/t/results/sectioning/part_before_top.pl
@@ -8,30 +8,14 @@ use utf8;
 $result_trees{'part_before_top'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
-            {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'extra' => {
-        'associated_part' => {
-          'args' => [
             {
               'contents' => [
                 {
-                  'text' => 'part'
+                  'text' => 'top'
                 }
               ],
               'info' => {
@@ -43,8 +27,32 @@ $result_trees{'part_before_top'} = [
               'type' => 'line_arg'
             }
           ],
+          'type' => 'argument'
+        }
+      ],
+      'extra' => {
+        'associated_part' => {
           'cmdname' => 'part',
           'contents' => [
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'text' => 'part'
+                    }
+                  ],
+                  'info' => {
+                    'spaces_after_argument' => {
+                      'text' => '
+'
+                    }
+                  },
+                  'type' => 'line_arg'
+                }
+              ],
+              'type' => 'argument'
+            },
             {
               'text' => '
 ',
diff --git a/tp/t/results/sectioning/part_chapter_after_top.pl 
b/tp/t/results/sectioning/part_chapter_after_top.pl
index 02d7ffb5dc..f6104d25b2 100644
--- a/tp/t/results/sectioning/part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_chapter_after_top.pl
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'part_chapter_after_top'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -150,23 +153,28 @@ $result_trees{'part_chapter_after_top'} = [
         'type' => 'before_node_section'
       },
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'Top'
@@ -186,43 +194,51 @@ $result_trees{'part_chapter_after_top'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
-            {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => ' 
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'extra' => {
-        'associated_part' => {
-          'args' => [
             {
               'contents' => [
                 {
-                  'text' => 'part'
+                  'text' => 'chapter'
                 }
               ],
               'info' => {
                 'spaces_after_argument' => {
-                  'text' => '
+                  'text' => ' 
 '
                 }
               },
               'type' => 'line_arg'
             }
           ],
+          'type' => 'argument'
+        }
+      ],
+      'extra' => {
+        'associated_part' => {
           'cmdname' => 'part',
           'contents' => [
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'text' => 'part'
+                    }
+                  ],
+                  'info' => {
+                    'spaces_after_argument' => {
+                      'text' => '
+'
+                    }
+                  },
+                  'type' => 'line_arg'
+                }
+              ],
+              'type' => 'argument'
+            },
             {
               'text' => '
 ',
@@ -253,23 +269,28 @@ $result_trees{'part_chapter_after_top'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'chapter'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'chapter'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'chapter'
@@ -288,7 +309,7 @@ $result_trees{'part_chapter_after_top'} = [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'part_chapter_after_top'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_chapter_after_top'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'part_chapter_after_top'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_chapter_after_top'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 $result_trees{'part_chapter_after_top'}[0]{'unit_contents'}[2] = 
$result_trees{'part_chapter_after_top'}[0]{'unit_command'};
 $result_trees{'part_chapter_after_top'}[1]{'unit_contents'}[0] = 
$result_trees{'part_chapter_after_top'}[1]{'unit_command'}{'extra'}{'associated_part'};
 $result_trees{'part_chapter_after_top'}[1]{'unit_contents'}[2] = 
$result_trees{'part_chapter_after_top'}[1]{'unit_command'};
diff --git a/tp/t/results/sectioning/part_chapter_appendix.pl 
b/tp/t/results/sectioning/part_chapter_appendix.pl
index 16dba5b14f..2d6e63a074 100644
--- a/tp/t/results/sectioning/part_chapter_appendix.pl
+++ b/tp/t/results/sectioning/part_chapter_appendix.pl
@@ -18,24 +18,27 @@ $result_trees{'part_chapter_appendix'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Part 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Part 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -53,24 +56,27 @@ $result_trees{'part_chapter_appendix'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -91,23 +97,28 @@ $result_trees{'part_chapter_appendix'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Appendix'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Appendix'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'appendix',
       'extra' => {
         'section_number' => 'A'
       },
diff --git a/tp/t/results/sectioning/part_node_after_top.pl 
b/tp/t/results/sectioning/part_node_after_top.pl
index ad617de079..ab4f1544d2 100644
--- a/tp/t/results/sectioning/part_node_after_top.pl
+++ b/tp/t/results/sectioning/part_node_after_top.pl
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'part_node_after_top'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -150,23 +153,28 @@ $result_trees{'part_node_after_top'} = [
         'type' => 'before_node_section'
       },
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'Top'
@@ -182,23 +190,28 @@ $result_trees{'part_node_after_top'} = [
       },
       {},
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'chap part node after top'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'chap part node after top'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'chap-part-node-after-top'
@@ -217,23 +230,28 @@ $result_trees{'part_node_after_top'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'part',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
@@ -250,7 +268,7 @@ $result_trees{'part_node_after_top'} = [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'part_node_after_top'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_after_top'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'part_node_after_top'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_after_top'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 $result_trees{'part_node_after_top'}[0]{'unit_contents'}[2] = 
$result_trees{'part_node_after_top'}[0]{'unit_command'};
 $result_trees{'part_node_after_top'}[1]{'unit_contents'}[0] = 
$result_trees{'part_node_after_top'}[1]{'unit_command'};
 
diff --git a/tp/t/results/sectioning/part_node_before_top.pl 
b/tp/t/results/sectioning/part_node_before_top.pl
index d863c45624..dab29eb2a8 100644
--- a/tp/t/results/sectioning/part_node_before_top.pl
+++ b/tp/t/results/sectioning/part_node_before_top.pl
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'part_node_before_top'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -132,24 +135,27 @@ $result_trees{'part_node_before_top'} = [
       ],
       'extra' => {
         'associated_part' => {
-          'args' => [
+          'cmdname' => 'part',
+          'contents' => [
             {
               'contents' => [
                 {
-                  'text' => 'part'
-                }
-              ],
-              'info' => {
-                'spaces_after_argument' => {
-                  'text' => '
+                  'contents' => [
+                    {
+                      'text' => 'part'
+                    }
+                  ],
+                  'info' => {
+                    'spaces_after_argument' => {
+                      'text' => '
 '
+                    }
+                  },
+                  'type' => 'line_arg'
                 }
-              },
-              'type' => 'line_arg'
-            }
-          ],
-          'cmdname' => 'part',
-          'contents' => [
+              ],
+              'type' => 'argument'
+            },
             {
               'text' => '
 ',
@@ -181,63 +187,68 @@ $result_trees{'part_node_before_top'} = [
         'type' => 'before_node_section'
       },
       {
-        'args' => [
-          {
-            'contents' => [
-              {
-                'text' => 'part node before top'
-              }
-            ],
-            'type' => 'line_arg'
-          },
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'part node before top'
+                  }
+                ],
+                'type' => 'line_arg'
               },
-              'normalized' => 'Top'
-            },
-            'info' => {
-              'spaces_before_argument' => {
-                'text' => ' '
-              }
-            },
-            'type' => 'line_arg'
-          },
-          {
-            'type' => 'line_arg'
-          },
-          {
-            'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'Top'
+                },
+                'info' => {
+                  'spaces_before_argument' => {
+                    'text' => ' '
+                  }
+                },
+                'type' => 'line_arg'
               },
-              'normalized' => 'Top'
-            },
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+              {
+                'type' => 'line_arg'
+              },
+              {
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'Top'
+                },
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'part-node-before-top'
@@ -253,23 +264,28 @@ $result_trees{'part_node_before_top'} = [
       },
       {},
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'Top'
@@ -288,9 +304,9 @@ $result_trees{'part_node_before_top'} = [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'part_node_before_top'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_before_top'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'part_node_before_top'}[0]{'unit_contents'}[1]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_before_top'}[0]{'unit_contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'part_node_before_top'}[0]{'unit_contents'}[1]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_before_top'}[0]{'unit_contents'}[1]{'args'}[3]{'contents'}[0];
+$result_trees{'part_node_before_top'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_before_top'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'part_node_before_top'}[0]{'unit_contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_before_top'}[0]{'unit_contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'part_node_before_top'}[0]{'unit_contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_before_top'}[0]{'unit_contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'part_node_before_top'}[0]{'unit_contents'}[2] = 
$result_trees{'part_node_before_top'}[0]{'unit_command'}{'extra'}{'associated_part'};
 $result_trees{'part_node_before_top'}[0]{'unit_contents'}[4] = 
$result_trees{'part_node_before_top'}[0]{'unit_command'};
 
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 e89d9f81ae..a65f5b22ef 100644
--- a/tp/t/results/sectioning/part_node_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_node_chapter_after_top.pl
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'part_node_chapter_after_top'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -196,23 +199,28 @@ $result_trees{'part_node_chapter_after_top'} = [
         'type' => 'before_node_section'
       },
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'Top'
@@ -232,43 +240,51 @@ $result_trees{'part_node_chapter_after_top'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
-            {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => ' 
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'extra' => {
-        'associated_part' => {
-          'args' => [
             {
               'contents' => [
                 {
-                  'text' => 'part'
+                  'text' => 'chapter'
                 }
               ],
               'info' => {
                 'spaces_after_argument' => {
-                  'text' => '
+                  'text' => ' 
 '
                 }
               },
               'type' => 'line_arg'
             }
           ],
+          'type' => 'argument'
+        }
+      ],
+      'extra' => {
+        'associated_part' => {
           'cmdname' => 'part',
           'contents' => [
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'text' => 'part'
+                    }
+                  ],
+                  'info' => {
+                    'spaces_after_argument' => {
+                      'text' => '
+'
+                    }
+                  },
+                  'type' => 'line_arg'
+                }
+              ],
+              'type' => 'argument'
+            },
             {
               'text' => '
 ',
@@ -299,85 +315,88 @@ $result_trees{'part_node_chapter_after_top'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
-          {
-            'contents' => [
-              {
-                'text' => 'a node after part'
-              }
-            ],
-            'type' => 'line_arg'
-          },
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'chapter'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'a node after part'
+                  }
+                ],
+                'type' => 'line_arg'
               },
-              'normalized' => 'chapter'
-            },
-            'info' => {
-              'spaces_before_argument' => {
-                'text' => ' '
-              }
-            },
-            'type' => 'line_arg'
-          },
-          {
-            'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'chapter'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'chapter'
+                },
+                'info' => {
+                  'spaces_before_argument' => {
+                    'text' => ' '
+                  }
+                },
+                'type' => 'line_arg'
               },
-              'normalized' => 'Top'
-            },
-            'info' => {
-              'spaces_before_argument' => {
-                'text' => ' '
-              }
-            },
-            'type' => 'line_arg'
-          },
-          {
-            'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'Top'
+                },
+                'info' => {
+                  'spaces_before_argument' => {
+                    'text' => ' '
+                  }
+                },
+                'type' => 'line_arg'
               },
-              'normalized' => 'Top'
-            },
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+              {
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'Top'
+                },
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
-              },
-              'spaces_before_argument' => {
-                'text' => ' '
+                  },
+                  'spaces_before_argument' => {
+                    'text' => ' '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'node',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'contents' => [
               {
@@ -407,66 +426,71 @@ $result_trees{'part_node_chapter_after_top'} = [
         }
       },
       {
-        'args' => [
-          {
-            'contents' => [
-              {
-                'text' => 'chapter'
-              }
-            ],
-            'type' => 'line_arg'
-          },
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'a node after part'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'chapter'
+                  }
+                ],
+                'type' => 'line_arg'
               },
-              'normalized' => 'a-node-after-part'
-            },
-            'info' => {
-              'spaces_before_argument' => {
-                'text' => ' '
-              }
-            },
-            'type' => 'line_arg'
-          },
-          {
-            'type' => 'line_arg'
-          },
-          {
-            'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'a node after part'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'a-node-after-part'
+                },
+                'info' => {
+                  'spaces_before_argument' => {
+                    'text' => ' '
+                  }
+                },
+                'type' => 'line_arg'
               },
-              'normalized' => 'Top'
-            },
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
-'
+              {
+                'type' => 'line_arg'
               },
-              'spaces_before_argument' => {
-                'text' => ' '
+              {
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'Top'
+                },
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
+'
+                  },
+                  'spaces_before_argument' => {
+                    'text' => ' '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'chapter'
@@ -485,15 +509,15 @@ $result_trees{'part_node_chapter_after_top'} = [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'part_node_chapter_after_top'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'part_node_chapter_after_top'}[0]{'unit_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[0]{'unit_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'part_node_chapter_after_top'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'part_node_chapter_after_top'}[0]{'unit_command'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[0]{'unit_command'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 $result_trees{'part_node_chapter_after_top'}[0]{'unit_contents'}[2] = 
$result_trees{'part_node_chapter_after_top'}[0]{'unit_command'};
 $result_trees{'part_node_chapter_after_top'}[1]{'unit_contents'}[0] = 
$result_trees{'part_node_chapter_after_top'}[1]{'unit_command'}{'extra'}{'associated_part'};
-$result_trees{'part_node_chapter_after_top'}[1]{'unit_contents'}[1]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'unit_contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'part_node_chapter_after_top'}[1]{'unit_contents'}[1]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'unit_contents'}[1]{'args'}[2]{'contents'}[0];
-$result_trees{'part_node_chapter_after_top'}[1]{'unit_contents'}[1]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'unit_contents'}[1]{'args'}[3]{'contents'}[0];
-$result_trees{'part_node_chapter_after_top'}[1]{'unit_contents'}[2]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'unit_contents'}[2]{'args'}[1]{'contents'}[0];
-$result_trees{'part_node_chapter_after_top'}[1]{'unit_contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'unit_contents'}[2]{'args'}[3]{'contents'}[0];
+$result_trees{'part_node_chapter_after_top'}[1]{'unit_contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'unit_contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'part_node_chapter_after_top'}[1]{'unit_contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'unit_contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'part_node_chapter_after_top'}[1]{'unit_contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'unit_contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'part_node_chapter_after_top'}[1]{'unit_contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'unit_contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'part_node_chapter_after_top'}[1]{'unit_contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'unit_contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'part_node_chapter_after_top'}[1]{'unit_contents'}[3] = 
$result_trees{'part_node_chapter_after_top'}[1]{'unit_command'};
 
 $result_texis{'part_node_chapter_after_top'} = '@node Top
diff --git a/tp/t/results/sectioning/part_node_chapter_appendix.pl 
b/tp/t/results/sectioning/part_node_chapter_appendix.pl
index 37d6d906f1..323d9cd914 100644
--- a/tp/t/results/sectioning/part_node_chapter_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_appendix.pl
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'part_node_chapter_appendix'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -150,23 +153,28 @@ $result_trees{'part_node_chapter_appendix'} = [
         'type' => 'before_node_section'
       },
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'Top'
@@ -186,37 +194,14 @@ $result_trees{'part_node_chapter_appendix'} = [
   },
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
       'cmdname' => 'chapter',
       'contents' => [
         {
-          'text' => '
-',
-          'type' => 'empty_line'
-        }
-      ],
-      'extra' => {
-        'associated_part' => {
-          'args' => [
+          'contents' => [
             {
               'contents' => [
                 {
-                  'text' => 'Part 1'
+                  'text' => 'chapter'
                 }
               ],
               'info' => {
@@ -228,8 +213,37 @@ $result_trees{'part_node_chapter_appendix'} = [
               'type' => 'line_arg'
             }
           ],
+          'type' => 'argument'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        }
+      ],
+      'extra' => {
+        'associated_part' => {
           'cmdname' => 'part',
           'contents' => [
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'text' => 'Part 1'
+                    }
+                  ],
+                  'info' => {
+                    'spaces_after_argument' => {
+                      'text' => '
+'
+                    }
+                  },
+                  'type' => 'line_arg'
+                }
+              ],
+              'type' => 'argument'
+            },
             {
               'text' => '
 ',
@@ -260,23 +274,28 @@ $result_trees{'part_node_chapter_appendix'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'chapter node'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'chapter node'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'chapter-node'
@@ -296,23 +315,28 @@ $result_trees{'part_node_chapter_appendix'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Appendix'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Appendix'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'appendix',
       'extra' => {
         'section_number' => 'A'
       },
@@ -331,7 +355,7 @@ $result_trees{'part_node_chapter_appendix'} = [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'part_node_chapter_appendix'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_chapter_appendix'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'part_node_chapter_appendix'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_chapter_appendix'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 $result_trees{'part_node_chapter_appendix'}[0]{'unit_contents'}[2] = 
$result_trees{'part_node_chapter_appendix'}[0]{'unit_command'};
 $result_trees{'part_node_chapter_appendix'}[1]{'unit_contents'}[0] = 
$result_trees{'part_node_chapter_appendix'}[1]{'unit_command'}{'extra'}{'associated_part'};
 $result_trees{'part_node_chapter_appendix'}[1]{'unit_contents'}[2] = 
$result_trees{'part_node_chapter_appendix'}[1]{'unit_command'};
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 f47632e511..199bf72d4f 100644
--- a/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'part_node_chapter_node_appendix'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -196,23 +199,28 @@ $result_trees{'part_node_chapter_node_appendix'} = [
         'type' => 'before_node_section'
       },
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'Top'
@@ -232,37 +240,14 @@ $result_trees{'part_node_chapter_node_appendix'} = [
   },
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
       'cmdname' => 'chapter',
       'contents' => [
         {
-          'text' => '
-',
-          'type' => 'empty_line'
-        }
-      ],
-      'extra' => {
-        'associated_part' => {
-          'args' => [
+          'contents' => [
             {
               'contents' => [
                 {
-                  'text' => 'Part 1'
+                  'text' => 'chapter'
                 }
               ],
               'info' => {
@@ -274,8 +259,37 @@ $result_trees{'part_node_chapter_node_appendix'} = [
               'type' => 'line_arg'
             }
           ],
+          'type' => 'argument'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        }
+      ],
+      'extra' => {
+        'associated_part' => {
           'cmdname' => 'part',
           'contents' => [
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'text' => 'Part 1'
+                    }
+                  ],
+                  'info' => {
+                    'spaces_after_argument' => {
+                      'text' => '
+'
+                    }
+                  },
+                  'type' => 'line_arg'
+                }
+              ],
+              'type' => 'argument'
+            },
             {
               'text' => '
 ',
@@ -306,23 +320,28 @@ $result_trees{'part_node_chapter_node_appendix'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'chapter node'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'chapter node'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'chapter-node'
@@ -342,23 +361,28 @@ $result_trees{'part_node_chapter_node_appendix'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Appendix'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Appendix'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'appendix',
       'extra' => {
         'section_number' => 'A'
       },
@@ -373,23 +397,28 @@ $result_trees{'part_node_chapter_node_appendix'} = [
     },
     'unit_contents' => [
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'appendix node'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'appendix node'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'appendix-node'
@@ -408,8 +437,8 @@ $result_trees{'part_node_chapter_node_appendix'} = [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'part_node_chapter_node_appendix'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_chapter_node_appendix'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'part_node_chapter_node_appendix'}[0]{'unit_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_chapter_node_appendix'}[0]{'unit_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'part_node_chapter_node_appendix'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_chapter_node_appendix'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'part_node_chapter_node_appendix'}[0]{'unit_command'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_chapter_node_appendix'}[0]{'unit_command'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 $result_trees{'part_node_chapter_node_appendix'}[0]{'unit_contents'}[2] = 
$result_trees{'part_node_chapter_node_appendix'}[0]{'unit_command'};
 $result_trees{'part_node_chapter_node_appendix'}[1]{'unit_contents'}[0] = 
$result_trees{'part_node_chapter_node_appendix'}[1]{'unit_command'}{'extra'}{'associated_part'};
 $result_trees{'part_node_chapter_node_appendix'}[1]{'unit_contents'}[2] = 
$result_trees{'part_node_chapter_node_appendix'}[1]{'unit_command'};
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 6a02afa9d3..18e55aef1e 100644
--- a/tp/t/results/sectioning/part_node_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_node_part_appendix.pl
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'part_node_node_part_appendix'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -196,23 +199,28 @@ $result_trees{'part_node_node_part_appendix'} = [
         'type' => 'before_node_section'
       },
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'Top'
@@ -232,37 +240,14 @@ $result_trees{'part_node_node_part_appendix'} = [
   },
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
       'cmdname' => 'chapter',
       'contents' => [
         {
-          'text' => '
-',
-          'type' => 'empty_line'
-        }
-      ],
-      'extra' => {
-        'associated_part' => {
-          'args' => [
+          'contents' => [
             {
               'contents' => [
                 {
-                  'text' => 'Part 1'
+                  'text' => 'chapter'
                 }
               ],
               'info' => {
@@ -274,8 +259,37 @@ $result_trees{'part_node_node_part_appendix'} = [
               'type' => 'line_arg'
             }
           ],
+          'type' => 'argument'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        }
+      ],
+      'extra' => {
+        'associated_part' => {
           'cmdname' => 'part',
           'contents' => [
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'text' => 'Part 1'
+                    }
+                  ],
+                  'info' => {
+                    'spaces_after_argument' => {
+                      'text' => '
+'
+                    }
+                  },
+                  'type' => 'line_arg'
+                }
+              ],
+              'type' => 'argument'
+            },
             {
               'text' => '
 ',
@@ -306,23 +320,28 @@ $result_trees{'part_node_node_part_appendix'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'chapter node'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'chapter node'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'chapter-node'
@@ -342,30 +361,14 @@ $result_trees{'part_node_node_part_appendix'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
-            {
-              'text' => 'Appendix'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'extra' => {
-        'associated_part' => {
-          'args' => [
             {
               'contents' => [
                 {
-                  'text' => 'Part Appendix'
+                  'text' => 'Appendix'
                 }
               ],
               'info' => {
@@ -377,8 +380,32 @@ $result_trees{'part_node_node_part_appendix'} = [
               'type' => 'line_arg'
             }
           ],
+          'type' => 'argument'
+        }
+      ],
+      'extra' => {
+        'associated_part' => {
           'cmdname' => 'part',
           'contents' => [
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'text' => 'Part Appendix'
+                    }
+                  ],
+                  'info' => {
+                    'spaces_after_argument' => {
+                      'text' => '
+'
+                    }
+                  },
+                  'type' => 'line_arg'
+                }
+              ],
+              'type' => 'argument'
+            },
             {
               'text' => '
 ',
@@ -408,23 +435,28 @@ $result_trees{'part_node_node_part_appendix'} = [
     },
     'unit_contents' => [
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'appendix part'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'appendix part'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'appendix-part'
@@ -444,8 +476,8 @@ $result_trees{'part_node_node_part_appendix'} = [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'part_node_node_part_appendix'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_node_part_appendix'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'part_node_node_part_appendix'}[0]{'unit_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_node_part_appendix'}[0]{'unit_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'part_node_node_part_appendix'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_node_part_appendix'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'part_node_node_part_appendix'}[0]{'unit_command'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_node_part_appendix'}[0]{'unit_command'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 $result_trees{'part_node_node_part_appendix'}[0]{'unit_contents'}[2] = 
$result_trees{'part_node_node_part_appendix'}[0]{'unit_command'};
 $result_trees{'part_node_node_part_appendix'}[1]{'unit_contents'}[0] = 
$result_trees{'part_node_node_part_appendix'}[1]{'unit_command'}{'extra'}{'associated_part'};
 $result_trees{'part_node_node_part_appendix'}[1]{'unit_contents'}[2] = 
$result_trees{'part_node_node_part_appendix'}[1]{'unit_command'};
diff --git a/tp/t/results/sectioning/part_node_part_appendix.pl 
b/tp/t/results/sectioning/part_node_part_appendix.pl
index e5a6ab44c4..cd6b8e5bba 100644
--- a/tp/t/results/sectioning/part_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_appendix.pl
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'part_node_part_appendix'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -150,23 +153,28 @@ $result_trees{'part_node_part_appendix'} = [
         'type' => 'before_node_section'
       },
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'Top'
@@ -186,37 +194,14 @@ $result_trees{'part_node_part_appendix'} = [
   },
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
       'cmdname' => 'chapter',
       'contents' => [
         {
-          'text' => '
-',
-          'type' => 'empty_line'
-        }
-      ],
-      'extra' => {
-        'associated_part' => {
-          'args' => [
+          'contents' => [
             {
               'contents' => [
                 {
-                  'text' => 'Part 1'
+                  'text' => 'chapter'
                 }
               ],
               'info' => {
@@ -228,8 +213,37 @@ $result_trees{'part_node_part_appendix'} = [
               'type' => 'line_arg'
             }
           ],
+          'type' => 'argument'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        }
+      ],
+      'extra' => {
+        'associated_part' => {
           'cmdname' => 'part',
           'contents' => [
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'text' => 'Part 1'
+                    }
+                  ],
+                  'info' => {
+                    'spaces_after_argument' => {
+                      'text' => '
+'
+                    }
+                  },
+                  'type' => 'line_arg'
+                }
+              ],
+              'type' => 'argument'
+            },
             {
               'text' => '
 ',
@@ -260,23 +274,28 @@ $result_trees{'part_node_part_appendix'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'chapter node'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'chapter node'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'chapter-node'
@@ -296,30 +315,14 @@ $result_trees{'part_node_part_appendix'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
-            {
-              'text' => 'Appendix'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'extra' => {
-        'associated_part' => {
-          'args' => [
             {
               'contents' => [
                 {
-                  'text' => 'Part Appendix'
+                  'text' => 'Appendix'
                 }
               ],
               'info' => {
@@ -331,8 +334,32 @@ $result_trees{'part_node_part_appendix'} = [
               'type' => 'line_arg'
             }
           ],
+          'type' => 'argument'
+        }
+      ],
+      'extra' => {
+        'associated_part' => {
           'cmdname' => 'part',
           'contents' => [
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'text' => 'Part Appendix'
+                    }
+                  ],
+                  'info' => {
+                    'spaces_after_argument' => {
+                      'text' => '
+'
+                    }
+                  },
+                  'type' => 'line_arg'
+                }
+              ],
+              'type' => 'argument'
+            },
             {
               'text' => '
 ',
@@ -367,7 +394,7 @@ $result_trees{'part_node_part_appendix'} = [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'part_node_part_appendix'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_part_appendix'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'part_node_part_appendix'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_part_appendix'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 $result_trees{'part_node_part_appendix'}[0]{'unit_contents'}[2] = 
$result_trees{'part_node_part_appendix'}[0]{'unit_command'};
 $result_trees{'part_node_part_appendix'}[1]{'unit_contents'}[0] = 
$result_trees{'part_node_part_appendix'}[1]{'unit_command'}{'extra'}{'associated_part'};
 $result_trees{'part_node_part_appendix'}[1]{'unit_contents'}[2] = 
$result_trees{'part_node_part_appendix'}[1]{'unit_command'};
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 2f1f0c0c95..e85edaa6fd 100644
--- a/tp/t/results/sectioning/part_node_part_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_node_appendix.pl
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'part_node_part_node_appendix'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -196,23 +199,28 @@ $result_trees{'part_node_part_node_appendix'} = [
         'type' => 'before_node_section'
       },
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'Top'
@@ -232,37 +240,14 @@ $result_trees{'part_node_part_node_appendix'} = [
   },
   {
     'unit_command' => {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
       'cmdname' => 'chapter',
       'contents' => [
         {
-          'text' => '
-',
-          'type' => 'empty_line'
-        }
-      ],
-      'extra' => {
-        'associated_part' => {
-          'args' => [
+          'contents' => [
             {
               'contents' => [
                 {
-                  'text' => 'Part 1'
+                  'text' => 'chapter'
                 }
               ],
               'info' => {
@@ -274,8 +259,37 @@ $result_trees{'part_node_part_node_appendix'} = [
               'type' => 'line_arg'
             }
           ],
+          'type' => 'argument'
+        },
+        {
+          'text' => '
+',
+          'type' => 'empty_line'
+        }
+      ],
+      'extra' => {
+        'associated_part' => {
           'cmdname' => 'part',
           'contents' => [
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'text' => 'Part 1'
+                    }
+                  ],
+                  'info' => {
+                    'spaces_after_argument' => {
+                      'text' => '
+'
+                    }
+                  },
+                  'type' => 'line_arg'
+                }
+              ],
+              'type' => 'argument'
+            },
             {
               'text' => '
 ',
@@ -306,23 +320,28 @@ $result_trees{'part_node_part_node_appendix'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'chapter node'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'chapter node'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'chapter-node'
@@ -342,30 +361,14 @@ $result_trees{'part_node_part_node_appendix'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'appendix',
+      'contents' => [
         {
           'contents' => [
-            {
-              'text' => 'Appendix'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'appendix',
-      'extra' => {
-        'associated_part' => {
-          'args' => [
             {
               'contents' => [
                 {
-                  'text' => 'Part Appendix'
+                  'text' => 'Appendix'
                 }
               ],
               'info' => {
@@ -377,8 +380,32 @@ $result_trees{'part_node_part_node_appendix'} = [
               'type' => 'line_arg'
             }
           ],
+          'type' => 'argument'
+        }
+      ],
+      'extra' => {
+        'associated_part' => {
           'cmdname' => 'part',
           'contents' => [
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'text' => 'Part Appendix'
+                    }
+                  ],
+                  'info' => {
+                    'spaces_after_argument' => {
+                      'text' => '
+'
+                    }
+                  },
+                  'type' => 'line_arg'
+                }
+              ],
+              'type' => 'argument'
+            },
             {
               'text' => '
 ',
@@ -409,23 +436,28 @@ $result_trees{'part_node_part_node_appendix'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'appendix node'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'appendix node'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'appendix-node'
@@ -444,8 +476,8 @@ $result_trees{'part_node_part_node_appendix'} = [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'part_node_part_node_appendix'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_part_node_appendix'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'part_node_part_node_appendix'}[0]{'unit_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_part_node_appendix'}[0]{'unit_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'part_node_part_node_appendix'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_part_node_appendix'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'part_node_part_node_appendix'}[0]{'unit_command'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'part_node_part_node_appendix'}[0]{'unit_command'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 $result_trees{'part_node_part_node_appendix'}[0]{'unit_contents'}[2] = 
$result_trees{'part_node_part_node_appendix'}[0]{'unit_command'};
 $result_trees{'part_node_part_node_appendix'}[1]{'unit_contents'}[0] = 
$result_trees{'part_node_part_node_appendix'}[1]{'unit_command'}{'extra'}{'associated_part'};
 $result_trees{'part_node_part_node_appendix'}[1]{'unit_contents'}[2] = 
$result_trees{'part_node_part_node_appendix'}[1]{'unit_command'};
diff --git a/tp/t/results/sectioning/part_section_part.pl 
b/tp/t/results/sectioning/part_section_part.pl
index 1dcb240352..d5df61cdd6 100644
--- a/tp/t/results/sectioning/part_section_part.pl
+++ b/tp/t/results/sectioning/part_section_part.pl
@@ -11,24 +11,27 @@ $result_trees{'part_section_part'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Part1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Part1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -46,24 +49,27 @@ $result_trees{'part_section_part'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -84,23 +90,28 @@ $result_trees{'part_section_part'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Part 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Part 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'part',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
diff --git a/tp/t/results/sectioning/protected_node_parentheses.pl 
b/tp/t/results/sectioning/protected_node_parentheses.pl
index cdb89fcdd5..e6e2109f59 100644
--- a/tp/t/results/sectioning/protected_node_parentheses.pl
+++ b/tp/t/results/sectioning/protected_node_parentheses.pl
@@ -18,23 +18,28 @@ $result_trees{'protected_node_parentheses'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'first'
@@ -49,24 +54,27 @@ $result_trees{'protected_node_parentheses'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -204,40 +212,43 @@ $result_trees{'protected_node_parentheses'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'asis',
               'contents' => [
                 {
+                  'cmdname' => 'asis',
                   'contents' => [
                     {
-                      'text' => '('
+                      'contents' => [
+                        {
+                          'text' => '('
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 9
+                  }
+                },
+                {
+                  'text' => 'manual) name'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 9
-              }
-            },
-            {
-              'text' => 'manual) name'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -356,10 +367,10 @@ $result_trees{'protected_node_parentheses'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'protected_node_parentheses'}{'contents'}[3]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'protected_node_parentheses'}{'contents'}[3]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'protected_node_parentheses'}{'contents'}[3]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'protected_node_parentheses'}{'contents'}[3]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'protected_node_parentheses'}{'contents'}[3]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'protected_node_parentheses'}{'contents'}[3]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'protected_node_parentheses'}{'contents'}[3]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'protected_node_parentheses'}{'contents'}[3]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
 $result_texis{'protected_node_parentheses'} = '
 @node first
diff --git a/tp/t/results/sectioning/recursive_self_section_reference.pl 
b/tp/t/results/sectioning/recursive_self_section_reference.pl
index 8ed20c74a5..3bafe788e3 100644
--- a/tp/t/results/sectioning/recursive_self_section_reference.pl
+++ b/tp/t/results/sectioning/recursive_self_section_reference.pl
@@ -16,23 +16,28 @@ $result_trees{'recursive_self_section_reference'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sharp'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sharp'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sharp'
@@ -47,47 +52,52 @@ $result_trees{'recursive_self_section_reference'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'ref',
               'contents' => [
                 {
+                  'cmdname' => 'ref',
                   'contents' => [
                     {
-                      'text' => 'sharp'
+                      'contents' => [
+                        {
+                          'text' => 'sharp'
+                        }
+                      ],
+                      'extra' => {
+                        'node_content' => {
+                          'contents' => [
+                            {}
+                          ]
+                        },
+                        'normalized' => 'sharp'
+                      },
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'extra' => {
-                    'node_content' => {
-                      'contents' => [
-                        {}
-                      ]
-                    },
-                    'normalized' => 'sharp'
-                  },
-                  'type' => 'brace_arg'
+                  'source_info' => {
+                    'line_nr' => 2
+                  }
+                },
+                {
+                  'text' => ' tuple'
                 }
               ],
-              'source_info' => {
-                'line_nr' => 2
-              }
-            },
-            {
-              'text' => ' tuple'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
@@ -103,7 +113,7 @@ $result_trees{'recursive_self_section_reference'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'recursive_self_section_reference'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'recursive_self_section_reference'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'recursive_self_section_reference'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'recursive_self_section_reference'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'recursive_self_section_reference'} = '@node sharp
 @chapter @ref{sharp} tuple
diff --git a/tp/t/results/sectioning/ref_to_top.pl 
b/tp/t/results/sectioning/ref_to_top.pl
index 7bf21822c3..b356228827 100644
--- a/tp/t/results/sectioning/ref_to_top.pl
+++ b/tp/t/results/sectioning/ref_to_top.pl
@@ -18,23 +18,28 @@ $result_trees{'ref_to_top'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'ToP'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'ToP'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -49,24 +54,27 @@ $result_trees{'ref_to_top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -119,7 +127,7 @@ $result_trees{'ref_to_top'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'ref_to_top'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_to_top'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_to_top'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'ref_to_top'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'ref_to_top'} = '
 @node ToP
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 a9a0ba6f5d..c8110c2f33 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
@@ -26,23 +26,28 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -58,24 +63,27 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -94,23 +102,28 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "\x{2000}\x{2001}\x{2002}"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "\x{2000}\x{2001}\x{2002}"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_2002_2003_2002'
@@ -126,24 +139,27 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => "EN QUAD|\x{2000}| EM QUAD|\x{2001}| EN 
SPACE|\x{2002}|"
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => "EN QUAD|\x{2000}| EM QUAD|\x{2001}| EN 
SPACE|\x{2002}|"
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -221,37 +237,42 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'code',
               'contents' => [
                 {
+                  'cmdname' => 'code',
                   'contents' => [
                     {
-                      'text' => "\x{2000}\x{2001}\x{2002}"
+                      'contents' => [
+                        {
+                          'text' => "\x{2000}\x{2001}\x{2002}"
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'file_name' => 
'reference_to_only_special_spaces_node.texi',
+                    'line_nr' => 10
+                  }
                 }
               ],
-              'source_info' => {
-                'file_name' => 'reference_to_only_special_spaces_node.texi',
-                'line_nr' => 10
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'normalized' => '_2002_2003_2002'
       },
@@ -266,38 +287,41 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'code',
               'contents' => [
                 {
+                  'cmdname' => 'code',
                   'contents' => [
                     {
-                      'text' => "EN QUAD|\x{2000}| EM QUAD|\x{2001}| EN 
SPACE|\x{2002}|"
+                      'contents' => [
+                        {
+                          'text' => "EN QUAD|\x{2000}| EM QUAD|\x{2001}| EN 
SPACE|\x{2002}|"
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'file_name' => 
'reference_to_only_special_spaces_node.texi',
+                    'line_nr' => 11
+                  }
                 }
               ],
-              'source_info' => {
-                'file_name' => 'reference_to_only_special_spaces_node.texi',
-                'line_nr' => 11
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -415,8 +439,8 @@ $result_trees{'reference_to_only_special_spaces_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'reference_to_only_special_spaces_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'reference_to_only_special_spaces_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'reference_to_only_special_spaces_node'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'reference_to_only_special_spaces_node'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'reference_to_only_special_spaces_node'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'reference_to_only_special_spaces_node'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'reference_to_only_special_spaces_node'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'reference_to_only_special_spaces_node'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'reference_to_only_special_spaces_node'} = '
 @node Top
diff --git a/tp/t/results/sectioning/section_before_after_top_node.pl 
b/tp/t/results/sectioning/section_before_after_top_node.pl
index 9d84fd3451..efc6b6afe4 100644
--- a/tp/t/results/sectioning/section_before_after_top_node.pl
+++ b/tp/t/results/sectioning/section_before_after_top_node.pl
@@ -16,24 +16,27 @@ $result_trees{'section_before_after_top_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'before'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'before'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -51,23 +54,28 @@ $result_trees{'section_before_after_top_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -82,24 +90,27 @@ $result_trees{'section_before_after_top_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -117,24 +128,27 @@ $result_trees{'section_before_after_top_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 8dd8840113..cd3e07b446 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
@@ -16,24 +16,27 @@ $result_trees{'section_before_after_top_node_last_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'before'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'before'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -51,23 +54,28 @@ $result_trees{'section_before_after_top_node_last_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -82,24 +90,27 @@ $result_trees{'section_before_after_top_node_last_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -117,24 +128,27 @@ $result_trees{'section_before_after_top_node_last_node'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -168,23 +182,28 @@ $result_trees{'section_before_after_top_node_last_node'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node after'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node after'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node-after'
diff --git a/tp/t/results/sectioning/section_before_chapter.pl 
b/tp/t/results/sectioning/section_before_chapter.pl
index 90921067b0..662b78d9a9 100644
--- a/tp/t/results/sectioning/section_before_chapter.pl
+++ b/tp/t/results/sectioning/section_before_chapter.pl
@@ -11,24 +11,27 @@ $result_trees{'section_before_chapter'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => ' 
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => ' 
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -48,23 +51,28 @@ $result_trees{'section_before_chapter'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '2'
       },
diff --git a/tp/t/results/sectioning/section_before_part.pl 
b/tp/t/results/sectioning/section_before_part.pl
index fbff8e12b4..72172c5184 100644
--- a/tp/t/results/sectioning/section_before_part.pl
+++ b/tp/t/results/sectioning/section_before_part.pl
@@ -16,24 +16,27 @@ $result_trees{'section_before_part'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => ' 
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => ' 
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -53,24 +56,27 @@ $result_trees{'section_before_part'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/sectioning/section_before_top.pl 
b/tp/t/results/sectioning/section_before_top.pl
index c5ce08be34..7bcbd7cd7a 100644
--- a/tp/t/results/sectioning/section_before_top.pl
+++ b/tp/t/results/sectioning/section_before_top.pl
@@ -11,45 +11,50 @@ $result_trees{'section_before_top'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'section node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'section node'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section-node'
@@ -64,24 +69,27 @@ $result_trees{'section_before_top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => ' 
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => ' 
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -101,23 +109,28 @@ $result_trees{'section_before_top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -132,24 +145,27 @@ $result_trees{'section_before_top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -267,8 +283,8 @@ $result_trees{'section_before_top'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'section_before_top'}{'contents'}[1]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'section_before_top'}{'contents'}[1]{'args'}[3]{'contents'}[0];
-$result_trees{'section_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_before_top'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_before_top'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'section_before_top'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_before_top'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'section_before_top'} = '@node section node,,,Top
 @section section 
diff --git a/tp/t/results/sectioning/section_before_top_no_node.pl 
b/tp/t/results/sectioning/section_before_top_no_node.pl
index 597cce40fb..b7c4aad4db 100644
--- a/tp/t/results/sectioning/section_before_top_no_node.pl
+++ b/tp/t/results/sectioning/section_before_top_no_node.pl
@@ -11,24 +11,27 @@ $result_trees{'section_before_top_no_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => ' 
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => ' 
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -48,23 +51,28 @@ $result_trees{'section_before_top_no_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'top',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
diff --git a/tp/t/results/sectioning/section_below_unnumbered.pl 
b/tp/t/results/sectioning/section_below_unnumbered.pl
index 8a9575f78b..87a4125d0b 100644
--- a/tp/t/results/sectioning/section_below_unnumbered.pl
+++ b/tp/t/results/sectioning/section_below_unnumbered.pl
@@ -47,23 +47,28 @@ $result_trees{'section_below_unnumbered'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -78,24 +83,27 @@ $result_trees{'section_below_unnumbered'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -235,23 +243,28 @@ $result_trees{'section_below_unnumbered'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Unn'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Unn'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Unn'
@@ -266,24 +279,27 @@ $result_trees{'section_below_unnumbered'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Unn'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Unn'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -404,23 +420,28 @@ $result_trees{'section_below_unnumbered'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Sec'
@@ -435,24 +456,27 @@ $result_trees{'section_below_unnumbered'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -496,8 +520,8 @@ $result_trees{'section_below_unnumbered'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'section_below_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_below_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_below_unnumbered'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_below_unnumbered'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_below_unnumbered'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_below_unnumbered'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_below_unnumbered'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_below_unnumbered'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'section_below_unnumbered'} = '
 @contents
diff --git a/tp/t/results/sectioning/section_below_unnumbered_no_top.pl 
b/tp/t/results/sectioning/section_below_unnumbered_no_top.pl
index 905d594185..aadaafcde3 100644
--- a/tp/t/results/sectioning/section_below_unnumbered_no_top.pl
+++ b/tp/t/results/sectioning/section_below_unnumbered_no_top.pl
@@ -16,23 +16,28 @@ $result_trees{'section_below_unnumbered_no_top'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'U'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'U'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'unnumbered',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
@@ -44,23 +49,28 @@ $result_trees{'section_below_unnumbered_no_top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'S'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'S'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
diff --git a/tp/t/results/sectioning/section_chapter_before_top.pl 
b/tp/t/results/sectioning/section_chapter_before_top.pl
index b4d3ad26ed..9188ac6983 100644
--- a/tp/t/results/sectioning/section_chapter_before_top.pl
+++ b/tp/t/results/sectioning/section_chapter_before_top.pl
@@ -11,24 +11,27 @@ $result_trees{'section_chapter_before_top'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => ' 
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => ' 
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -48,24 +51,27 @@ $result_trees{'section_chapter_before_top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -85,23 +91,28 @@ $result_trees{'section_chapter_before_top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'top',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
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 69c5f346e2..fe86546956 100644
--- a/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
+++ b/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
@@ -16,23 +16,28 @@ $result_trees{'section_chapter_before_top_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section-node'
@@ -47,24 +52,27 @@ $result_trees{'section_chapter_before_top_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => ' 
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => ' 
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -84,23 +92,28 @@ $result_trees{'section_chapter_before_top_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-node'
@@ -115,24 +128,27 @@ $result_trees{'section_chapter_before_top_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -255,23 +271,28 @@ $result_trees{'section_chapter_before_top_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -286,24 +307,27 @@ $result_trees{'section_chapter_before_top_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -426,8 +450,8 @@ $result_trees{'section_chapter_before_top_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'section_chapter_before_top_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'section_chapter_before_top_nodes'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_chapter_before_top_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'section_chapter_before_top_nodes'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'section_chapter_before_top_nodes'} = '@node section node
 @section section 
diff --git a/tp/t/results/sectioning/section_node_before_part.pl 
b/tp/t/results/sectioning/section_node_before_part.pl
index dbc44e23f1..52419aad47 100644
--- a/tp/t/results/sectioning/section_node_before_part.pl
+++ b/tp/t/results/sectioning/section_node_before_part.pl
@@ -18,23 +18,28 @@ $result_trees{'section_node_before_part'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -49,24 +54,27 @@ $result_trees{'section_node_before_part'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => ' 
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => ' 
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -86,23 +94,28 @@ $result_trees{'section_node_before_part'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'part',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
diff --git a/tp/t/results/sectioning/sections.pl 
b/tp/t/results/sectioning/sections.pl
index 6d8f828153..29117c8e6f 100644
--- a/tp/t/results/sectioning/sections.pl
+++ b/tp/t/results/sectioning/sections.pl
@@ -11,23 +11,28 @@ $result_trees{'sections'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'a chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'a chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
diff --git a/tp/t/results/sectioning/semi_auto.pl 
b/tp/t/results/sectioning/semi_auto.pl
index 16543d7a0d..82f9d0b122 100644
--- a/tp/t/results/sectioning/semi_auto.pl
+++ b/tp/t/results/sectioning/semi_auto.pl
@@ -11,23 +11,28 @@ $result_trees{'semi_auto'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'semi_auto'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -226,23 +234,28 @@ $result_trees{'semi_auto'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Chap1'
@@ -257,24 +270,27 @@ $result_trees{'semi_auto'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -397,23 +413,28 @@ $result_trees{'semi_auto'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sec in chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sec in chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Sec-in-chapter'
@@ -428,24 +449,27 @@ $result_trees{'semi_auto'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sec in chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sec in chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -465,66 +489,71 @@ $result_trees{'semi_auto'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'Section non auto'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap1'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Section non auto'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'Chap1'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Chap1'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Chap1'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Section-non-auto'
@@ -539,23 +568,28 @@ $result_trees{'semi_auto'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {
         'section_number' => '1.2'
       },
@@ -571,11 +605,11 @@ $result_trees{'semi_auto'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'semi_auto'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'semi_auto'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'semi_auto'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'semi_auto'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'semi_auto'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'semi_auto'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'semi_auto'}{'contents'}[7]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'semi_auto'}{'contents'}[7]{'args'}[2]{'contents'}[0];
-$result_trees{'semi_auto'}{'contents'}[7]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'semi_auto'}{'contents'}[7]{'args'}[3]{'contents'}[0];
+$result_trees{'semi_auto'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'semi_auto'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'semi_auto'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'semi_auto'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'semi_auto'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'semi_auto'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'semi_auto'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'semi_auto'}{'contents'}[7]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'semi_auto'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'semi_auto'}{'contents'}[7]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'semi_auto'} = '@node Top
 @top Top
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 31f79f477d..f5763984ae 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
@@ -16,23 +16,28 @@ $result_trees{'setfilename_on_top_and_after_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,48 +52,51 @@ $result_trees{'setfilename_on_top_and_after_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'In top '
-            },
-            {
-              'args' => [
+              'contents' => [
+                {
+                  'text' => 'In top '
+                },
                 {
-                  'contents' => [
+                  'args' => [
                     {
-                      'text' => 'very badly placed setfilename'
+                      'contents' => [
+                        {
+                          'text' => 'very badly placed setfilename'
+                        }
+                      ],
+                      'info' => {
+                        'spaces_after_argument' => {
+                          'text' => '
+'
+                        }
+                      },
+                      'type' => 'line_arg'
                     }
                   ],
+                  'cmdname' => 'setfilename',
+                  'extra' => {
+                    'text_arg' => 'very badly placed setfilename'
+                  },
                   'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
-'
+                    'spaces_before_argument' => {
+                      'text' => ' '
                     }
                   },
-                  'type' => 'line_arg'
+                  'source_info' => {
+                    'line_nr' => 2
+                  }
                 }
               ],
-              'cmdname' => 'setfilename',
-              'extra' => {
-                'text_arg' => 'very badly placed setfilename'
-              },
-              'info' => {
-                'spaces_before_argument' => {
-                  'text' => ' '
-                }
-              },
-              'source_info' => {
-                'line_nr' => 2
-              }
+              'type' => 'line_arg'
             }
           ],
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/sectioning/space_in_node.pl 
b/tp/t/results/sectioning/space_in_node.pl
index 84b3e0656b..ffb51514e0 100644
--- a/tp/t/results/sectioning/space_in_node.pl
+++ b/tp/t/results/sectioning/space_in_node.pl
@@ -18,24 +18,27 @@ $result_trees{'space_in_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -268,24 +271,27 @@ $result_trees{'space_in_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap first  here'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap first  here'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -306,24 +312,27 @@ $result_trees{'space_in_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Test               title'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Test               title'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -344,23 +353,28 @@ $result_trees{'space_in_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Last with spaces'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => ' 
+              'contents' => [
+                {
+                  'text' => 'Last with spaces'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => ' 
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Last-with-spaces'
@@ -377,10 +391,10 @@ $result_trees{'space_in_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[0];
-$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1];
+$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[0];
+$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[1];
 
 $result_texis{'space_in_node'} = '
 @node Top
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 f80ea67c07..82dd7da8f0 100644
--- a/tp/t/results/sectioning/split_for_format_not_split.pl
+++ b/tp/t/results/sectioning/split_for_format_not_split.pl
@@ -31,24 +31,27 @@ $result_trees{'split_for_format_not_split'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/sectioning/top_no_argument_and_content.pl 
b/tp/t/results/sectioning/top_no_argument_and_content.pl
index cf08b272c8..6c59d21182 100644
--- a/tp/t/results/sectioning/top_no_argument_and_content.pl
+++ b/tp/t/results/sectioning/top_no_argument_and_content.pl
@@ -16,19 +16,22 @@ $result_trees{'top_no_argument_and_content'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 8bd4eaa2c7..5c7d7815e4 100644
--- a/tp/t/results/sectioning/top_no_argument_and_node.pl
+++ b/tp/t/results/sectioning/top_no_argument_and_node.pl
@@ -11,23 +11,28 @@ $result_trees{'top_no_argument_and_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'start'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'start'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'start'
@@ -42,18 +47,23 @@ $result_trees{'top_no_argument_and_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'top',
       'extra' => {},
       'source_info' => {
         'line_nr' => 2
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 2e7237a2ea..cf78e677c5 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
@@ -11,23 +11,28 @@ $result_trees{'top_no_argument_and_top_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,18 +47,23 @@ $result_trees{'top_no_argument_and_top_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'top',
       'extra' => {},
       'source_info' => {
         'line_nr' => 2
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 5efc18134f..e7a368a3b5 100644
--- a/tp/t/results/sectioning/top_node_no_menu_direction.pl
+++ b/tp/t/results/sectioning/top_node_no_menu_direction.pl
@@ -11,24 +11,27 @@ $result_trees{'top_node_no_menu_direction'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -198,58 +201,63 @@ $result_trees{'top_node_no_menu_direction'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chap node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chap node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'TOP'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'TOP'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap-node'
@@ -266,10 +274,10 @@ $result_trees{'top_node_no_menu_direction'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'top_node_no_menu_direction'}{'contents'}[2]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_node_no_menu_direction'}{'contents'}[2]{'args'}[2]{'contents'}[0];
-$result_trees{'top_node_no_menu_direction'}{'contents'}[2]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_node_no_menu_direction'}{'contents'}[2]{'args'}[3]{'contents'}[0];
+$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'top_node_no_menu_direction'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_node_no_menu_direction'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'top_node_no_menu_direction'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'top_node_no_menu_direction'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'top_node_no_menu_direction'} = '@node Top
 
diff --git a/tp/t/results/sectioning/top_node_part_top.pl 
b/tp/t/results/sectioning/top_node_part_top.pl
index 9e006a49fe..7983346264 100644
--- a/tp/t/results/sectioning/top_node_part_top.pl
+++ b/tp/t/results/sectioning/top_node_part_top.pl
@@ -8,30 +8,14 @@ use utf8;
 $result_trees{'top_node_part_top'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
-            {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'extra' => {
-        'associated_part' => {
-          'args' => [
             {
               'contents' => [
                 {
-                  'text' => 'part'
+                  'text' => 'top'
                 }
               ],
               'info' => {
@@ -43,8 +27,32 @@ $result_trees{'top_node_part_top'} = [
               'type' => 'line_arg'
             }
           ],
+          'type' => 'argument'
+        }
+      ],
+      'extra' => {
+        'associated_part' => {
           'cmdname' => 'part',
           'contents' => [
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'text' => 'part'
+                    }
+                  ],
+                  'info' => {
+                    'spaces_after_argument' => {
+                      'text' => '
+'
+                    }
+                  },
+                  'type' => 'line_arg'
+                }
+              ],
+              'type' => 'argument'
+            },
             {
               'text' => '
 ',
@@ -81,24 +89,27 @@ $result_trees{'top_node_part_top'} = [
         'type' => 'before_node_section'
       },
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'node',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
diff --git a/tp/t/results/sectioning/top_part_chapter.pl 
b/tp/t/results/sectioning/top_part_chapter.pl
index f63f08f50f..6107593d7a 100644
--- a/tp/t/results/sectioning/top_part_chapter.pl
+++ b/tp/t/results/sectioning/top_part_chapter.pl
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'top_part_chapter'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -52,43 +55,51 @@ $result_trees{'top_part_chapter'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
-            {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => ' 
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'extra' => {
-        'associated_part' => {
-          'args' => [
             {
               'contents' => [
                 {
-                  'text' => 'part'
+                  'text' => 'chapter'
                 }
               ],
               'info' => {
                 'spaces_after_argument' => {
-                  'text' => '
+                  'text' => ' 
 '
                 }
               },
               'type' => 'line_arg'
             }
           ],
+          'type' => 'argument'
+        }
+      ],
+      'extra' => {
+        'associated_part' => {
           'cmdname' => 'part',
           'contents' => [
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'text' => 'part'
+                    }
+                  ],
+                  'info' => {
+                    'spaces_after_argument' => {
+                      'text' => '
+'
+                    }
+                  },
+                  'type' => 'line_arg'
+                }
+              ],
+              'type' => 'argument'
+            },
             {
               'text' => '
 ',
diff --git a/tp/t/results/sectioning/top_without_node_nodes.pl 
b/tp/t/results/sectioning/top_without_node_nodes.pl
index 7794733974..1da0371a75 100644
--- a/tp/t/results/sectioning/top_without_node_nodes.pl
+++ b/tp/t/results/sectioning/top_without_node_nodes.pl
@@ -8,50 +8,55 @@ use utf8;
 $result_trees{'top_without_node_nodes'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
+              'contents' => [
+                {
+                  'text' => 'second'
+                }
+              ],
+              'type' => 'line_arg'
+            },
             {
-              'text' => '('
+              'type' => 'line_arg'
             },
             {
-              'text' => 'dir'
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'second'
@@ -70,24 +75,27 @@ $result_trees{'top_without_node_nodes'} = [
         'type' => 'before_node_section'
       },
       {
-        'args' => [
+        'cmdname' => 'top',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'top section'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'top section'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'top',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'contents' => [
               {
@@ -115,24 +123,27 @@ $result_trees{'top_without_node_nodes'} = [
       },
       {},
       {
-        'args' => [
+        'cmdname' => 'chapter',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Chapter'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Chapter'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'chapter',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -164,7 +175,7 @@ $result_trees{'top_without_node_nodes'} = [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'top_without_node_nodes'}[0]{'unit_command'}{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_without_node_nodes'}[0]{'unit_command'}{'args'}[3]{'contents'}[1];
+$result_trees{'top_without_node_nodes'}[0]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_without_node_nodes'}[0]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 $result_trees{'top_without_node_nodes'}[0]{'unit_contents'}[2] = 
$result_trees{'top_without_node_nodes'}[0]{'unit_command'};
 
 $result_texis{'top_without_node_nodes'} = '@top top section
diff --git a/tp/t/results/sectioning/top_without_node_sections.pl 
b/tp/t/results/sectioning/top_without_node_sections.pl
index 816eff380c..35829fa043 100644
--- a/tp/t/results/sectioning/top_without_node_sections.pl
+++ b/tp/t/results/sectioning/top_without_node_sections.pl
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'top_without_node_sections'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -61,24 +64,27 @@ $result_trees{'top_without_node_sections'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -108,50 +114,55 @@ $result_trees{'top_without_node_sections'} = [
     },
     'unit_contents' => [
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'second'
-              }
-            ],
-            'type' => 'line_arg'
-          },
-          {
-            'type' => 'line_arg'
-          },
-          {
-            'type' => 'line_arg'
-          },
-          {
-            'contents' => [
+                'contents' => [
+                  {
+                    'text' => 'second'
+                  }
+                ],
+                'type' => 'line_arg'
+              },
               {
-                'text' => '('
+                'type' => 'line_arg'
               },
               {
-                'text' => 'dir'
+                'type' => 'line_arg'
               },
               {
-                'text' => ')'
-              }
-            ],
-            'extra' => {
-              'manual_content' => {
                 'contents' => [
-                  {}
-                ]
-              }
-            },
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                  {
+                    'text' => '('
+                  },
+                  {
+                    'text' => 'dir'
+                  },
+                  {
+                    'text' => ')'
+                  }
+                ],
+                'extra' => {
+                  'manual_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  }
+                },
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'second'
@@ -171,7 +182,7 @@ $result_trees{'top_without_node_sections'} = [
   }
 ];
 $result_trees{'top_without_node_sections'}[0]{'unit_contents'}[1] = 
$result_trees{'top_without_node_sections'}[0]{'unit_command'};
-$result_trees{'top_without_node_sections'}[1]{'unit_contents'}[0]{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_without_node_sections'}[1]{'unit_contents'}[0]{'args'}[3]{'contents'}[1];
+$result_trees{'top_without_node_sections'}[1]{'unit_contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_without_node_sections'}[1]{'unit_contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1];
 $result_trees{'top_without_node_sections'}[1]{'unit_contents'}[1] = 
$result_trees{'top_without_node_sections'}[1]{'unit_command'};
 
 $result_texis{'top_without_node_sections'} = '@top top section
diff --git a/tp/t/results/sectioning/top_without_node_texi2html_no_use_nodes.pl 
b/tp/t/results/sectioning/top_without_node_texi2html_no_use_nodes.pl
index 524448d759..d5b2fa2892 100644
--- a/tp/t/results/sectioning/top_without_node_texi2html_no_use_nodes.pl
+++ b/tp/t/results/sectioning/top_without_node_texi2html_no_use_nodes.pl
@@ -16,24 +16,27 @@ $result_trees{'top_without_node_texi2html_no_use_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -60,50 +63,55 @@ $result_trees{'top_without_node_texi2html_no_use_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
+              'contents' => [
+                {
+                  'text' => 'second'
+                }
+              ],
+              'type' => 'line_arg'
+            },
             {
-              'text' => '('
+              'type' => 'line_arg'
             },
             {
-              'text' => 'dir'
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'second'
@@ -118,24 +126,27 @@ $result_trees{'top_without_node_texi2html_no_use_nodes'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -166,7 +177,7 @@ $result_trees{'top_without_node_texi2html_no_use_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'top_without_node_texi2html_no_use_nodes'}{'contents'}[2]{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_without_node_texi2html_no_use_nodes'}{'contents'}[2]{'args'}[3]{'contents'}[1];
+$result_trees{'top_without_node_texi2html_no_use_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'top_without_node_texi2html_no_use_nodes'}{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
 $result_texis{'top_without_node_texi2html_no_use_nodes'} = '@top top section
 Top section
diff --git a/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl 
b/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
index 5e0842d018..b8b0c46b79 100644
--- a/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
+++ b/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'transliterated_split_equivalent_nodes'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -281,36 +284,41 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => '~',
               'contents' => [
                 {
+                  'cmdname' => '~',
                   'contents' => [
                     {
-                      'text' => 'a'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'following_arg'
                     }
                   ],
-                  'type' => 'following_arg'
+                  'source_info' => {
+                    'line_nr' => 9
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 9
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_00e3'
@@ -327,37 +335,40 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'unnumbered',
+        'contents' => [
           {
             'contents' => [
               {
-                'cmdname' => '~',
                 'contents' => [
                   {
+                    'cmdname' => '~',
                     'contents' => [
                       {
-                        'text' => 'a'
+                        'contents' => [
+                          {
+                            'text' => 'a'
+                          }
+                        ],
+                        'type' => 'following_arg'
                       }
                     ],
-                    'type' => 'following_arg'
+                    'source_info' => {
+                      'line_nr' => 10
+                    }
                   }
                 ],
-                'source_info' => {
-                  'line_nr' => 10
-                }
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'unnumbered',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -379,24 +390,27 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'n'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'n'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -423,36 +437,41 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => '^',
               'contents' => [
                 {
+                  'cmdname' => '^',
                   'contents' => [
                     {
-                      'text' => 'a'
+                      'contents' => [
+                        {
+                          'text' => 'a'
+                        }
+                      ],
+                      'type' => 'following_arg'
                     }
                   ],
-                  'type' => 'following_arg'
+                  'source_info' => {
+                    'line_nr' => 14
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 14
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '_00e2'
@@ -472,9 +491,9 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'transliterated_split_equivalent_nodes'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'transliterated_split_equivalent_nodes'}[0]{'unit_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'unit_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'transliterated_split_equivalent_nodes'}[0]{'unit_command'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'unit_command'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'transliterated_split_equivalent_nodes'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'transliterated_split_equivalent_nodes'}[0]{'unit_command'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'unit_command'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'transliterated_split_equivalent_nodes'}[0]{'unit_command'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'unit_command'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
 $result_trees{'transliterated_split_equivalent_nodes'}[0]{'unit_contents'}[1] 
= $result_trees{'transliterated_split_equivalent_nodes'}[0]{'unit_command'};
 $result_trees{'transliterated_split_equivalent_nodes'}[1]{'unit_contents'}[0] 
= $result_trees{'transliterated_split_equivalent_nodes'}[1]{'unit_command'};
 $result_trees{'transliterated_split_equivalent_nodes'}[2]{'unit_contents'}[0] 
= $result_trees{'transliterated_split_equivalent_nodes'}[2]{'unit_command'};
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 5f9030c28d..bf71a1cd01 100644
--- a/tp/t/results/sectioning/two_nodes_at_the_end.pl
+++ b/tp/t/results/sectioning/two_nodes_at_the_end.pl
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'two_nodes_at_the_end'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -247,23 +250,28 @@ $result_trees{'two_nodes_at_the_end'} = [
         'type' => 'before_node_section'
       },
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'Top'
@@ -283,24 +291,27 @@ $result_trees{'two_nodes_at_the_end'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter c1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter c1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -321,84 +332,89 @@ $result_trees{'two_nodes_at_the_end'} = [
     },
     'unit_contents' => [
       {
-        'args' => [
-          {
-            'contents' => [
-              {
-                'text' => 'chapter 1'
-              }
-            ],
-            'type' => 'line_arg'
-          },
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'node after chapter 1'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'chapter 1'
+                  }
+                ],
+                'type' => 'line_arg'
               },
-              'normalized' => 'node-after-chapter-1'
-            },
-            'info' => {
-              'spaces_before_argument' => {
-                'text' => ' '
-              }
-            },
-            'type' => 'line_arg'
-          },
-          {
-            'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'node after chapter 1'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'node-after-chapter-1'
+                },
+                'info' => {
+                  'spaces_before_argument' => {
+                    'text' => ' '
+                  }
+                },
+                'type' => 'line_arg'
               },
-              'normalized' => 'Top'
-            },
-            'info' => {
-              'spaces_before_argument' => {
-                'text' => ' '
-              }
-            },
-            'type' => 'line_arg'
-          },
-          {
-            'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'Top'
+                },
+                'info' => {
+                  'spaces_before_argument' => {
+                    'text' => ' '
+                  }
+                },
+                'type' => 'line_arg'
               },
-              'normalized' => 'Top'
-            },
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+              {
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'Top'
+                },
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
-              },
-              'spaces_before_argument' => {
-                'text' => ' '
+                  },
+                  'spaces_before_argument' => {
+                    'text' => ' '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'chapter-1'
@@ -414,24 +430,27 @@ $result_trees{'two_nodes_at_the_end'} = [
       },
       {},
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'node after chapter 1'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'node after chapter 1'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'node',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -466,23 +485,28 @@ $result_trees{'two_nodes_at_the_end'} = [
         }
       },
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'last node in chapter 1'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'last node in chapter 1'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'last-node-in-chapter-1'
@@ -500,13 +524,13 @@ $result_trees{'two_nodes_at_the_end'} = [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'two_nodes_at_the_end'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'two_nodes_at_the_end'}[0]{'unit_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[0]{'unit_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'two_nodes_at_the_end'}[0]{'unit_command'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[0]{'unit_command'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_nodes_at_the_end'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_nodes_at_the_end'}[0]{'unit_command'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[0]{'unit_command'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_nodes_at_the_end'}[0]{'unit_command'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[0]{'unit_command'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
 $result_trees{'two_nodes_at_the_end'}[0]{'unit_contents'}[2] = 
$result_trees{'two_nodes_at_the_end'}[0]{'unit_command'};
-$result_trees{'two_nodes_at_the_end'}[1]{'unit_contents'}[0]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[1]{'unit_contents'}[0]{'args'}[1]{'contents'}[0];
-$result_trees{'two_nodes_at_the_end'}[1]{'unit_contents'}[0]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[1]{'unit_contents'}[0]{'args'}[2]{'contents'}[0];
-$result_trees{'two_nodes_at_the_end'}[1]{'unit_contents'}[0]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[1]{'unit_contents'}[0]{'args'}[3]{'contents'}[0];
+$result_trees{'two_nodes_at_the_end'}[1]{'unit_contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[1]{'unit_contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_nodes_at_the_end'}[1]{'unit_contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[1]{'unit_contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'two_nodes_at_the_end'}[1]{'unit_contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[1]{'unit_contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'two_nodes_at_the_end'}[1]{'unit_contents'}[1] = 
$result_trees{'two_nodes_at_the_end'}[1]{'unit_command'};
 
 $result_texis{'two_nodes_at_the_end'} = '@node Top
diff --git a/tp/t/results/sectioning/two_nodes_at_the_end_nodes.pl 
b/tp/t/results/sectioning/two_nodes_at_the_end_nodes.pl
index c0e6c1e179..fe44d25739 100644
--- a/tp/t/results/sectioning/two_nodes_at_the_end_nodes.pl
+++ b/tp/t/results/sectioning/two_nodes_at_the_end_nodes.pl
@@ -16,23 +16,28 @@ $result_trees{'two_nodes_at_the_end_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'two_nodes_at_the_end_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -277,84 +285,89 @@ $result_trees{'two_nodes_at_the_end_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chapter 1'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node after chapter 1'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chapter 1'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'node-after-chapter-1'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'node after chapter 1'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'node-after-chapter-1'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-1'
@@ -369,24 +382,27 @@ $result_trees{'two_nodes_at_the_end_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter c1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter c1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -406,24 +422,27 @@ $result_trees{'two_nodes_at_the_end_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node after chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node after chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -458,23 +477,28 @@ $result_trees{'two_nodes_at_the_end_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'last node in chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'last node in chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'last-node-in-chapter-1'
@@ -491,12 +515,12 @@ $result_trees{'two_nodes_at_the_end_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'two_nodes_at_the_end_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'two_nodes_at_the_end_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'two_nodes_at_the_end_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'two_nodes_at_the_end_nodes'}{'contents'}[3]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end_nodes'}{'contents'}[3]{'args'}[1]{'contents'}[0];
-$result_trees{'two_nodes_at_the_end_nodes'}{'contents'}[3]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end_nodes'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'two_nodes_at_the_end_nodes'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end_nodes'}{'contents'}[3]{'args'}[3]{'contents'}[0];
+$result_trees{'two_nodes_at_the_end_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_nodes_at_the_end_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_nodes_at_the_end_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_nodes_at_the_end_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_nodes_at_the_end_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'two_nodes_at_the_end_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'two_nodes_at_the_end_nodes'} = '@node Top
 @top top
diff --git a/tp/t/results/sectioning/two_nodes_at_the_end_texi2html.pl 
b/tp/t/results/sectioning/two_nodes_at_the_end_texi2html.pl
index d4210bac54..2353e0190b 100644
--- a/tp/t/results/sectioning/two_nodes_at_the_end_texi2html.pl
+++ b/tp/t/results/sectioning/two_nodes_at_the_end_texi2html.pl
@@ -16,23 +16,28 @@ $result_trees{'two_nodes_at_the_end_texi2html'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'two_nodes_at_the_end_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -277,84 +285,89 @@ $result_trees{'two_nodes_at_the_end_texi2html'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chapter 1'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node after chapter 1'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chapter 1'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'node-after-chapter-1'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'node after chapter 1'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'node-after-chapter-1'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-1'
@@ -369,24 +382,27 @@ $result_trees{'two_nodes_at_the_end_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter c1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter c1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -406,24 +422,27 @@ $result_trees{'two_nodes_at_the_end_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node after chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node after chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -458,23 +477,28 @@ $result_trees{'two_nodes_at_the_end_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'last node in chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'last node in chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'last-node-in-chapter-1'
@@ -491,12 +515,12 @@ $result_trees{'two_nodes_at_the_end_texi2html'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'two_nodes_at_the_end_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'two_nodes_at_the_end_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'two_nodes_at_the_end_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'two_nodes_at_the_end_texi2html'}{'contents'}[3]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end_texi2html'}{'contents'}[3]{'args'}[1]{'contents'}[0];
-$result_trees{'two_nodes_at_the_end_texi2html'}{'contents'}[3]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end_texi2html'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'two_nodes_at_the_end_texi2html'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end_texi2html'}{'contents'}[3]{'args'}[3]{'contents'}[0];
+$result_trees{'two_nodes_at_the_end_texi2html'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end_texi2html'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_nodes_at_the_end_texi2html'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end_texi2html'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_nodes_at_the_end_texi2html'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end_texi2html'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_nodes_at_the_end_texi2html'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end_texi2html'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_nodes_at_the_end_texi2html'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end_texi2html'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'two_nodes_at_the_end_texi2html'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_at_the_end_texi2html'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'two_nodes_at_the_end_texi2html'} = '@node Top
 @top top
diff --git a/tp/t/results/sectioning/two_nodes_between_chapters.pl 
b/tp/t/results/sectioning/two_nodes_between_chapters.pl
index aa8d793392..1f2e44bd23 100644
--- a/tp/t/results/sectioning/two_nodes_between_chapters.pl
+++ b/tp/t/results/sectioning/two_nodes_between_chapters.pl
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'two_nodes_between_chapters'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -247,23 +250,28 @@ $result_trees{'two_nodes_between_chapters'} = [
         'type' => 'before_node_section'
       },
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'Top'
@@ -283,24 +291,27 @@ $result_trees{'two_nodes_between_chapters'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter c1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter c1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -321,84 +332,89 @@ $result_trees{'two_nodes_between_chapters'} = [
     },
     'unit_contents' => [
       {
-        'args' => [
-          {
-            'contents' => [
-              {
-                'text' => 'chapter 1'
-              }
-            ],
-            'type' => 'line_arg'
-          },
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'chapter 1'
+                  }
+                ],
+                'type' => 'line_arg'
               },
-              'normalized' => 'Top'
-            },
-            'info' => {
-              'spaces_before_argument' => {
-                'text' => ' '
-              }
-            },
-            'type' => 'line_arg'
-          },
-          {
-            'contents' => [
               {
-                'text' => 'node between chapters'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'Top'
+                },
+                'info' => {
+                  'spaces_before_argument' => {
+                    'text' => ' '
+                  }
+                },
+                'type' => 'line_arg'
               },
-              'normalized' => 'node-between-chapters'
-            },
-            'info' => {
-              'spaces_before_argument' => {
-                'text' => ' '
-              }
-            },
-            'type' => 'line_arg'
-          },
-          {
-            'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'extra' => {
-              'node_content' => {
                 'contents' => [
-                  {}
-                ]
+                  {
+                    'text' => 'node between chapters'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'node-between-chapters'
+                },
+                'info' => {
+                  'spaces_before_argument' => {
+                    'text' => ' '
+                  }
+                },
+                'type' => 'line_arg'
               },
-              'normalized' => 'Top'
-            },
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+              {
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'extra' => {
+                  'node_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  },
+                  'normalized' => 'Top'
+                },
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
-              },
-              'spaces_before_argument' => {
-                'text' => ' '
+                  },
+                  'spaces_before_argument' => {
+                    'text' => ' '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'chapter-1'
@@ -414,24 +430,27 @@ $result_trees{'two_nodes_between_chapters'} = [
       },
       {},
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'node between chapters'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'node between chapters'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'node',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -456,23 +475,28 @@ $result_trees{'two_nodes_between_chapters'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter c2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter c2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '2'
       },
@@ -487,23 +511,28 @@ $result_trees{'two_nodes_between_chapters'} = [
     },
     'unit_contents' => [
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'chapter 2'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'chapter 2'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'chapter-2'
@@ -522,13 +551,13 @@ $result_trees{'two_nodes_between_chapters'} = [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'two_nodes_between_chapters'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[0]{'unit_command'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'two_nodes_between_chapters'}[0]{'unit_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[0]{'unit_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'two_nodes_between_chapters'}[0]{'unit_command'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[0]{'unit_command'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_nodes_between_chapters'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[0]{'unit_command'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_nodes_between_chapters'}[0]{'unit_command'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[0]{'unit_command'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_nodes_between_chapters'}[0]{'unit_command'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[0]{'unit_command'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
 $result_trees{'two_nodes_between_chapters'}[0]{'unit_contents'}[2] = 
$result_trees{'two_nodes_between_chapters'}[0]{'unit_command'};
-$result_trees{'two_nodes_between_chapters'}[1]{'unit_contents'}[0]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[1]{'unit_contents'}[0]{'args'}[1]{'contents'}[0];
-$result_trees{'two_nodes_between_chapters'}[1]{'unit_contents'}[0]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[1]{'unit_contents'}[0]{'args'}[2]{'contents'}[0];
-$result_trees{'two_nodes_between_chapters'}[1]{'unit_contents'}[0]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[1]{'unit_contents'}[0]{'args'}[3]{'contents'}[0];
+$result_trees{'two_nodes_between_chapters'}[1]{'unit_contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[1]{'unit_contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_nodes_between_chapters'}[1]{'unit_contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[1]{'unit_contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'two_nodes_between_chapters'}[1]{'unit_contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[1]{'unit_contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'two_nodes_between_chapters'}[1]{'unit_contents'}[1] = 
$result_trees{'two_nodes_between_chapters'}[1]{'unit_command'};
 $result_trees{'two_nodes_between_chapters'}[2]{'unit_contents'}[1] = 
$result_trees{'two_nodes_between_chapters'}[2]{'unit_command'};
 
diff --git a/tp/t/results/sectioning/two_nodes_between_chapters_nodes.pl 
b/tp/t/results/sectioning/two_nodes_between_chapters_nodes.pl
index e97b5f9c91..4968495340 100644
--- a/tp/t/results/sectioning/two_nodes_between_chapters_nodes.pl
+++ b/tp/t/results/sectioning/two_nodes_between_chapters_nodes.pl
@@ -16,23 +16,28 @@ $result_trees{'two_nodes_between_chapters_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'two_nodes_between_chapters_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -277,84 +285,89 @@ $result_trees{'two_nodes_between_chapters_nodes'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chapter 1'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chapter 1'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'node between chapters'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'node-between-chapters'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'node between chapters'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'node-between-chapters'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-1'
@@ -369,24 +382,27 @@ $result_trees{'two_nodes_between_chapters_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter c1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter c1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -406,24 +422,27 @@ $result_trees{'two_nodes_between_chapters_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node between chapters'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node between chapters'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -444,23 +463,28 @@ $result_trees{'two_nodes_between_chapters_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-2'
@@ -475,23 +499,28 @@ $result_trees{'two_nodes_between_chapters_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter c2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter c2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '2'
       },
@@ -507,12 +536,12 @@ $result_trees{'two_nodes_between_chapters_nodes'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'two_nodes_between_chapters_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'two_nodes_between_chapters_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'two_nodes_between_chapters_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'two_nodes_between_chapters_nodes'}{'contents'}[3]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters_nodes'}{'contents'}[3]{'args'}[1]{'contents'}[0];
-$result_trees{'two_nodes_between_chapters_nodes'}{'contents'}[3]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters_nodes'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'two_nodes_between_chapters_nodes'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters_nodes'}{'contents'}[3]{'args'}[3]{'contents'}[0];
+$result_trees{'two_nodes_between_chapters_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_nodes_between_chapters_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_nodes_between_chapters_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_nodes_between_chapters_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_nodes_between_chapters_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'two_nodes_between_chapters_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters_nodes'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'two_nodes_between_chapters_nodes'} = '@node Top
 @top top
diff --git a/tp/t/results/sectioning/two_nodes_between_chapters_texi2html.pl 
b/tp/t/results/sectioning/two_nodes_between_chapters_texi2html.pl
index 59cf938ce8..7a42887084 100644
--- a/tp/t/results/sectioning/two_nodes_between_chapters_texi2html.pl
+++ b/tp/t/results/sectioning/two_nodes_between_chapters_texi2html.pl
@@ -16,23 +16,28 @@ $result_trees{'two_nodes_between_chapters_texi2html'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'two_nodes_between_chapters_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -277,84 +285,89 @@ $result_trees{'two_nodes_between_chapters_texi2html'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'chapter 1'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'chapter 1'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'node between chapters'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'node-between-chapters'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'node between chapters'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'node-between-chapters'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-1'
@@ -369,24 +382,27 @@ $result_trees{'two_nodes_between_chapters_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter c1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter c1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -406,24 +422,27 @@ $result_trees{'two_nodes_between_chapters_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'node between chapters'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'node between chapters'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -444,23 +463,28 @@ $result_trees{'two_nodes_between_chapters_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter 2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter-2'
@@ -475,23 +499,28 @@ $result_trees{'two_nodes_between_chapters_texi2html'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter c2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter c2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '2'
       },
@@ -507,12 +536,12 @@ $result_trees{'two_nodes_between_chapters_texi2html'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'two_nodes_between_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'two_nodes_between_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'two_nodes_between_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'two_nodes_between_chapters_texi2html'}{'contents'}[3]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters_texi2html'}{'contents'}[3]{'args'}[1]{'contents'}[0];
-$result_trees{'two_nodes_between_chapters_texi2html'}{'contents'}[3]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters_texi2html'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'two_nodes_between_chapters_texi2html'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters_texi2html'}{'contents'}[3]{'args'}[3]{'contents'}[0];
+$result_trees{'two_nodes_between_chapters_texi2html'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters_texi2html'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_nodes_between_chapters_texi2html'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters_texi2html'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_nodes_between_chapters_texi2html'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters_texi2html'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_nodes_between_chapters_texi2html'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters_texi2html'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'two_nodes_between_chapters_texi2html'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters_texi2html'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'two_nodes_between_chapters_texi2html'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'two_nodes_between_chapters_texi2html'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
 $result_texis{'two_nodes_between_chapters_texi2html'} = '@node Top
 @top top
diff --git a/tp/t/results/sectioning/two_unnumbered_no_argument.pl 
b/tp/t/results/sectioning/two_unnumbered_no_argument.pl
index ae667c8bd4..2535a98104 100644
--- a/tp/t/results/sectioning/two_unnumbered_no_argument.pl
+++ b/tp/t/results/sectioning/two_unnumbered_no_argument.pl
@@ -16,36 +16,46 @@ $result_trees{'two_unnumbered_no_argument'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'unnumbered',
       'extra' => {},
       'source_info' => {
         'line_nr' => 1
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'unnumbered',
       'extra' => {},
       'source_info' => {
         'line_nr' => 2
diff --git a/tp/t/results/sectioning/unknown_node_direction_novalidate.pl 
b/tp/t/results/sectioning/unknown_node_direction_novalidate.pl
index d2cab2a2f2..9fb19cf7eb 100644
--- a/tp/t/results/sectioning/unknown_node_direction_novalidate.pl
+++ b/tp/t/results/sectioning/unknown_node_direction_novalidate.pl
@@ -31,42 +31,47 @@ $result_trees{'unknown_node_direction_novalidate'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'one arg2'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'two arg'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'one arg2'
+                }
+              ],
+              'type' => 'line_arg'
             },
-            'normalized' => 'two-arg'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'two arg'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'two-arg'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'one-arg2'
@@ -83,7 +88,7 @@ $result_trees{'unknown_node_direction_novalidate'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'unknown_node_direction_novalidate'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'unknown_node_direction_novalidate'}{'contents'}[1]{'args'}[1]{'contents'}[0];
+$result_trees{'unknown_node_direction_novalidate'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'unknown_node_direction_novalidate'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'unknown_node_direction_novalidate'} = '@novalidate
 
diff --git a/tp/t/results/sectioning/unknown_node_in_menu.pl 
b/tp/t/results/sectioning/unknown_node_in_menu.pl
index e0e963b8f4..93cb8dc1e3 100644
--- a/tp/t/results/sectioning/unknown_node_in_menu.pl
+++ b/tp/t/results/sectioning/unknown_node_in_menu.pl
@@ -11,24 +11,27 @@ $result_trees{'unknown_node_in_menu'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -149,7 +152,7 @@ $result_trees{'unknown_node_in_menu'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'unknown_node_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'unknown_node_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'unknown_node_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'unknown_node_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'unknown_node_in_menu'} = '@node first
 
diff --git a/tp/t/results/sectioning/unknown_node_in_menu_novalidate.pl 
b/tp/t/results/sectioning/unknown_node_in_menu_novalidate.pl
index 56f05aa938..6692853f23 100644
--- a/tp/t/results/sectioning/unknown_node_in_menu_novalidate.pl
+++ b/tp/t/results/sectioning/unknown_node_in_menu_novalidate.pl
@@ -31,24 +31,27 @@ $result_trees{'unknown_node_in_menu_novalidate'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'first'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'first'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -169,7 +172,7 @@ $result_trees{'unknown_node_in_menu_novalidate'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'unknown_node_in_menu_novalidate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'unknown_node_in_menu_novalidate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'unknown_node_in_menu_novalidate'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'unknown_node_in_menu_novalidate'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'unknown_node_in_menu_novalidate'} = '@novalidate
 
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 2529d58e60..d66679e29c 100644
--- a/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
+++ b/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'unnumbered_before_node_top_top'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'before nodes'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'before nodes'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -66,24 +69,27 @@ $result_trees{'unnumbered_before_node_top_top'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -106,23 +112,28 @@ $result_trees{'unnumbered_before_node_top_top'} = [
     },
     'unit_contents' => [
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/unnumbered_before_top.pl 
b/tp/t/results/sectioning/unnumbered_before_top.pl
index 5e79c25bb4..727a4ca4db 100644
--- a/tp/t/results/sectioning/unnumbered_before_top.pl
+++ b/tp/t/results/sectioning/unnumbered_before_top.pl
@@ -11,24 +11,27 @@ $result_trees{'unnumbered_before_top'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'before top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'before top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -46,23 +49,28 @@ $result_trees{'unnumbered_before_top'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'top',
       'extra' => {},
       'info' => {
         'spaces_before_argument' => {
diff --git a/tp/t/results/sectioning/unnumbered_before_top_node.pl 
b/tp/t/results/sectioning/unnumbered_before_top_node.pl
index 0f590004a4..a4968a156d 100644
--- a/tp/t/results/sectioning/unnumbered_before_top_node.pl
+++ b/tp/t/results/sectioning/unnumbered_before_top_node.pl
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'unnumbered_before_top_node'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'before nodes'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'before nodes'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -48,24 +51,27 @@ $result_trees{'unnumbered_before_top_node'} = [
       },
       {},
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'node',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'contents' => [
               {
diff --git a/tp/t/results/sectioning/unnumbered_no_argument.pl 
b/tp/t/results/sectioning/unnumbered_no_argument.pl
index 5c8d2e430d..cff5f7691f 100644
--- a/tp/t/results/sectioning/unnumbered_no_argument.pl
+++ b/tp/t/results/sectioning/unnumbered_no_argument.pl
@@ -11,18 +11,23 @@ $result_trees{'unnumbered_no_argument'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'unnumbered',
       'extra' => {},
       'source_info' => {
         'line_nr' => 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 75470e493f..ac330226c2 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
@@ -8,50 +8,55 @@ use utf8;
 $result_trees{'unnumbered_top_without_node_nodes'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'a node'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
+              'contents' => [
+                {
+                  'text' => 'a node'
+                }
+              ],
+              'type' => 'line_arg'
+            },
             {
-              'text' => '('
+              'type' => 'line_arg'
             },
             {
-              'text' => 'dir'
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'a-node'
@@ -71,24 +76,27 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
       },
       {},
       {
-        'args' => [
+        'cmdname' => 'unnumbered',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'unnumbered'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'unnumbered'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'unnumbered',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -120,24 +128,27 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
         }
       },
       {
-        'args' => [
+        'cmdname' => 'top',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'top section'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'top section'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'top',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'contents' => [
               {
@@ -168,50 +179,55 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'second'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
+              'contents' => [
+                {
+                  'text' => 'second'
+                }
+              ],
+              'type' => 'line_arg'
+            },
             {
-              'text' => '('
+              'type' => 'line_arg'
             },
             {
-              'text' => 'dir'
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'second'
@@ -228,24 +244,27 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
     'unit_contents' => [
       {},
       {
-        'args' => [
+        'cmdname' => 'chapter',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Chapter'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Chapter'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'chapter',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
@@ -277,9 +296,9 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'unnumbered_top_without_node_nodes'}[0]{'unit_command'}{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'unnumbered_top_without_node_nodes'}[0]{'unit_command'}{'args'}[3]{'contents'}[1];
+$result_trees{'unnumbered_top_without_node_nodes'}[0]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'unnumbered_top_without_node_nodes'}[0]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 $result_trees{'unnumbered_top_without_node_nodes'}[0]{'unit_contents'}[1] = 
$result_trees{'unnumbered_top_without_node_nodes'}[0]{'unit_command'};
-$result_trees{'unnumbered_top_without_node_nodes'}[1]{'unit_command'}{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'unnumbered_top_without_node_nodes'}[1]{'unit_command'}{'args'}[3]{'contents'}[1];
+$result_trees{'unnumbered_top_without_node_nodes'}[1]{'unit_command'}{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'unnumbered_top_without_node_nodes'}[1]{'unit_command'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 $result_trees{'unnumbered_top_without_node_nodes'}[1]{'unit_contents'}[0] = 
$result_trees{'unnumbered_top_without_node_nodes'}[1]{'unit_command'};
 
 $result_texis{'unnumbered_top_without_node_nodes'} = '@node a node,,,(dir)
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 f369aea794..6f7c87600c 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
@@ -8,24 +8,27 @@ use utf8;
 $result_trees{'unnumbered_top_without_node_sections'} = [
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'unnumbered'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'unnumbered'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -66,50 +69,55 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
         'type' => 'before_node_section'
       },
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'a node'
-              }
-            ],
-            'type' => 'line_arg'
-          },
-          {
-            'type' => 'line_arg'
-          },
-          {
-            'type' => 'line_arg'
-          },
-          {
-            'contents' => [
+                'contents' => [
+                  {
+                    'text' => 'a node'
+                  }
+                ],
+                'type' => 'line_arg'
+              },
               {
-                'text' => '('
+                'type' => 'line_arg'
               },
               {
-                'text' => 'dir'
+                'type' => 'line_arg'
               },
               {
-                'text' => ')'
-              }
-            ],
-            'extra' => {
-              'manual_content' => {
                 'contents' => [
-                  {}
-                ]
-              }
-            },
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                  {
+                    'text' => '('
+                  },
+                  {
+                    'text' => 'dir'
+                  },
+                  {
+                    'text' => ')'
+                  }
+                ],
+                'extra' => {
+                  'manual_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  }
+                },
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'a-node'
@@ -129,24 +137,27 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -179,24 +190,27 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
   },
   {
     'unit_command' => {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -226,50 +240,55 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
     },
     'unit_contents' => [
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'second'
-              }
-            ],
-            'type' => 'line_arg'
-          },
-          {
-            'type' => 'line_arg'
-          },
-          {
-            'type' => 'line_arg'
-          },
-          {
-            'contents' => [
+                'contents' => [
+                  {
+                    'text' => 'second'
+                  }
+                ],
+                'type' => 'line_arg'
+              },
               {
-                'text' => '('
+                'type' => 'line_arg'
               },
               {
-                'text' => 'dir'
+                'type' => 'line_arg'
               },
               {
-                'text' => ')'
-              }
-            ],
-            'extra' => {
-              'manual_content' => {
                 'contents' => [
-                  {}
-                ]
-              }
-            },
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                  {
+                    'text' => '('
+                  },
+                  {
+                    'text' => 'dir'
+                  },
+                  {
+                    'text' => ')'
+                  }
+                ],
+                'extra' => {
+                  'manual_content' => {
+                    'contents' => [
+                      {}
+                    ]
+                  }
+                },
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
+            ],
+            'type' => 'argument'
           }
         ],
-        'cmdname' => 'node',
         'extra' => {
           'is_target' => 1,
           'normalized' => 'second'
@@ -288,10 +307,10 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
     'unit_type' => 'unit'
   }
 ];
-$result_trees{'unnumbered_top_without_node_sections'}[0]{'unit_contents'}[1]{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'unnumbered_top_without_node_sections'}[0]{'unit_contents'}[1]{'args'}[3]{'contents'}[1];
+$result_trees{'unnumbered_top_without_node_sections'}[0]{'unit_contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'unnumbered_top_without_node_sections'}[0]{'unit_contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
 $result_trees{'unnumbered_top_without_node_sections'}[0]{'unit_contents'}[2] = 
$result_trees{'unnumbered_top_without_node_sections'}[0]{'unit_command'};
 $result_trees{'unnumbered_top_without_node_sections'}[1]{'unit_contents'}[0] = 
$result_trees{'unnumbered_top_without_node_sections'}[1]{'unit_command'};
-$result_trees{'unnumbered_top_without_node_sections'}[2]{'unit_contents'}[0]{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'unnumbered_top_without_node_sections'}[2]{'unit_contents'}[0]{'args'}[3]{'contents'}[1];
+$result_trees{'unnumbered_top_without_node_sections'}[2]{'unit_contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'unnumbered_top_without_node_sections'}[2]{'unit_contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1];
 $result_trees{'unnumbered_top_without_node_sections'}[2]{'unit_contents'}[1] = 
$result_trees{'unnumbered_top_without_node_sections'}[2]{'unit_command'};
 
 $result_texis{'unnumbered_top_without_node_sections'} = '@node a node,,,(dir)
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 f58885c27c..55b814026e 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
@@ -31,23 +31,28 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -99,23 +107,28 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -132,24 +145,27 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -597,10 +613,10 @@ 
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'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'}[2]{'contents'}[0]{'contents'}[1]{'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'}[2]{'contents'}[0]{'contents'}[2]{'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]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'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'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'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'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'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'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'index_entries_relate_to_item_no_transformation'} = '\\input 
texinfo @c -*-texinfo-*-
 
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 9a7bc55410..39eb25b503 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
@@ -31,23 +31,28 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -63,24 +68,27 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -99,23 +107,28 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'isindex' => 1,
@@ -132,24 +145,27 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -603,10 +619,10 @@ 
$result_trees{'index_entries_relate_to_item_transformation'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'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'}[2]{'contents'}[0]{'contents'}[1]{'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'}[2]{'contents'}[0]{'contents'}[2]{'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]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'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'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[3];
+$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[3];
+$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'index_entries_relate_to_item_transformation'} = '\\input 
texinfo @c -*-texinfo-*-
 
diff --git 
a/tp/t/results/transformations/insert_nodes_for_sectioning_commands.pl 
b/tp/t/results/transformations/insert_nodes_for_sectioning_commands.pl
index 351e9adb89..cf28d6f4d8 100644
--- a/tp/t/results/transformations/insert_nodes_for_sectioning_commands.pl
+++ b/tp/t/results/transformations/insert_nodes_for_sectioning_commands.pl
@@ -11,23 +11,28 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -39,24 +44,27 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -74,24 +82,27 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'part',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'part'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'part'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'part',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -109,47 +120,52 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            },
-            {
-              'cmdname' => 'comma',
               'contents' => [
                 {
-                  'type' => 'brace_container'
-                }
-              ]
-            },
-            {
-              'text' => ' '
-            },
-            {
-              'cmdname' => 'code',
-              'contents' => [
+                  'text' => 'chap'
+                },
                 {
+                  'cmdname' => 'comma',
                   'contents' => [
                     {
-                      'text' => 'a chap'
+                      'type' => 'brace_container'
                     }
-                  ],
-                  'type' => 'brace_container'
+                  ]
+                },
+                {
+                  'text' => ' '
+                },
+                {
+                  'cmdname' => 'code',
+                  'contents' => [
+                    {
+                      'contents' => [
+                        {
+                          'text' => 'a chap'
+                        }
+                      ],
+                      'type' => 'brace_container'
+                    }
+                  ]
                 }
-              ]
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap_002c-a-chap'
@@ -161,40 +177,43 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap, '
-            },
-            {
-              'cmdname' => 'code',
               'contents' => [
                 {
+                  'text' => 'chap, '
+                },
+                {
+                  'cmdname' => 'code',
                   'contents' => [
                     {
-                      'text' => 'a chap'
+                      'contents' => [
+                        {
+                          'text' => 'a chap'
+                        }
+                      ],
+                      'type' => 'brace_container'
                     }
                   ],
-                  'type' => 'brace_container'
+                  'source_info' => {
+                    'line_nr' => 5
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 5
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -215,23 +234,28 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'a node'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'a node'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'a-node'
@@ -246,24 +270,27 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -283,23 +310,28 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'truc'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'truc'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'truc'
@@ -311,23 +343,28 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'truc'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'truc'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {
         'section_number' => '1.2'
       },
@@ -341,23 +378,28 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sub1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sub1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sub1'
@@ -369,24 +411,27 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sub1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sub1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -420,23 +465,28 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sub2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sub2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sub2'
@@ -448,33 +498,36 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'subsection',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sub2'
-            }
-          ],
-          'info' => {
-            'comment_at_end' => {
-              'args' => [
+              'contents' => [
                 {
-                  'text' => ' comment
-',
-                  'type' => 'rawline_arg'
+                  'text' => 'sub2'
                 }
               ],
-              'cmdname' => 'c'
-            },
-            'spaces_after_argument' => {
-              'text' => ' '
+              'info' => {
+                'comment_at_end' => {
+                  'args' => [
+                    {
+                      'text' => ' comment
+',
+                      'type' => 'rawline_arg'
+                    }
+                  ],
+                  'cmdname' => 'c'
+                },
+                'spaces_after_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'subsection',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -494,23 +547,28 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -522,24 +580,27 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -559,26 +620,31 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            },
-            {
-              'text' => ' 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                },
+                {
+                  'text' => ' 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section-1'
@@ -590,24 +656,27 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -627,26 +696,31 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => ''
-            },
-            {
-              'text' => ' 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => ''
+                },
+                {
+                  'text' => ' 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '-1'
@@ -658,19 +732,22 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'unnumbered',
+      'contents' => [
         {
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+          'contents' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'unnumbered',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -683,31 +760,36 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'asis',
               'contents' => [
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'asis',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ]
+                },
+                {
+                  'text' => ' 2'
                 }
-              ]
-            },
-            {
-              'text' => ' 2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => '-2'
@@ -719,32 +801,35 @@ $result_trees{'insert_nodes_for_sectioning_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'asis',
               'contents' => [
                 {
-                  'type' => 'brace_container'
+                  'cmdname' => 'asis',
+                  'contents' => [
+                    {
+                      'type' => 'brace_container'
+                    }
+                  ],
+                  'source_info' => {
+                    'line_nr' => 23
+                  }
                 }
               ],
-              'source_info' => {
-                'line_nr' => 23
-              }
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/transformations/master_menu_fr.pl 
b/tp/t/results/transformations/master_menu_fr.pl
index 12f971c4cb..09617fcc83 100644
--- a/tp/t/results/transformations/master_menu_fr.pl
+++ b/tp/t/results/transformations/master_menu_fr.pl
@@ -69,23 +69,28 @@ $result_trees{'master_menu_fr'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -101,24 +106,27 @@ $result_trees{'master_menu_fr'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'max'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'max'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -204,19 +212,22 @@ $result_trees{'master_menu_fr'} = {
               'type' => 'menu_comment'
             },
             {
-              'args' => [
+              'cmdname' => 'detailmenu',
+              'contents' => [
                 {
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
+                  'contents' => [
+                    {
+                      'info' => {
+                        'spaces_after_argument' => {
+                          'text' => '
 '
+                        }
+                      },
+                      'type' => 'block_line_arg'
                     }
-                  },
-                  'type' => 'block_line_arg'
-                }
-              ],
-              'cmdname' => 'detailmenu',
-              'contents' => [
+                  ],
+                  'type' => 'argument'
+                },
                 {
                   'contents' => [
                     {
@@ -379,23 +390,28 @@ $result_trees{'master_menu_fr'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -411,24 +427,27 @@ $result_trees{'master_menu_fr'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -555,23 +574,28 @@ $result_trees{'master_menu_fr'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'section'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'section'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'section'
@@ -587,23 +611,28 @@ $result_trees{'master_menu_fr'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {
         'section_number' => '1.1'
       },
@@ -620,9 +649,9 @@ $result_trees{'master_menu_fr'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'master_menu_fr'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'master_menu_fr'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'master_menu_fr'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'master_menu_fr'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'master_menu_fr'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'master_menu_fr'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'master_menu_fr'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'master_menu_fr'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'master_menu_fr'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'master_menu_fr'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'master_menu_fr'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'master_menu_fr'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'master_menu_fr'} = '\\input texinfo.tex
 
diff --git 
a/tp/t/results/transformations/regenerate_master_menu_no_need_for_master_menu.pl
 
b/tp/t/results/transformations/regenerate_master_menu_no_need_for_master_menu.pl
index a0faef450d..34e1544db0 100644
--- 
a/tp/t/results/transformations/regenerate_master_menu_no_need_for_master_menu.pl
+++ 
b/tp/t/results/transformations/regenerate_master_menu_no_need_for_master_menu.pl
@@ -11,23 +11,28 @@ 
$result_trees{'regenerate_master_menu_no_need_for_master_menu'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ 
$result_trees{'regenerate_master_menu_no_need_for_master_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -180,23 +188,28 @@ 
$result_trees{'regenerate_master_menu_no_need_for_master_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -211,23 +224,28 @@ 
$result_trees{'regenerate_master_menu_no_need_for_master_menu'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '1'
       },
@@ -243,7 +261,7 @@ 
$result_trees{'regenerate_master_menu_no_need_for_master_menu'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'regenerate_master_menu_no_need_for_master_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'regenerate_master_menu_no_need_for_master_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'regenerate_master_menu_no_need_for_master_menu'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'regenerate_master_menu_no_need_for_master_menu'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'regenerate_master_menu_no_need_for_master_menu'} = '@node Top
 @top top
diff --git 
a/tp/t/results/transformations/regenerate_master_menu_with_menu_comment.pl 
b/tp/t/results/transformations/regenerate_master_menu_with_menu_comment.pl
index 2e1a1ce469..0a251c7159 100644
--- a/tp/t/results/transformations/regenerate_master_menu_with_menu_comment.pl
+++ b/tp/t/results/transformations/regenerate_master_menu_with_menu_comment.pl
@@ -11,23 +11,28 @@ $result_trees{'regenerate_master_menu_with_menu_comment'} = 
{
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'regenerate_master_menu_with_menu_comment'} = 
{
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -153,19 +161,22 @@ $result_trees{'regenerate_master_menu_with_menu_comment'} 
= {
               'type' => 'menu_comment'
             },
             {
-              'args' => [
+              'cmdname' => 'detailmenu',
+              'contents' => [
                 {
-                  'info' => {
-                    'spaces_after_argument' => {
-                      'text' => '
+                  'contents' => [
+                    {
+                      'info' => {
+                        'spaces_after_argument' => {
+                          'text' => '
 '
+                        }
+                      },
+                      'type' => 'block_line_arg'
                     }
-                  },
-                  'type' => 'block_line_arg'
-                }
-              ],
-              'cmdname' => 'detailmenu',
-              'contents' => [
+                  ],
+                  'type' => 'argument'
+                },
                 {
                   'contents' => [
                     {
@@ -325,23 +336,28 @@ $result_trees{'regenerate_master_menu_with_menu_comment'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -356,24 +372,27 @@ $result_trees{'regenerate_master_menu_with_menu_comment'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -393,23 +412,28 @@ $result_trees{'regenerate_master_menu_with_menu_comment'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sec'
@@ -424,23 +448,28 @@ $result_trees{'regenerate_master_menu_with_menu_comment'} 
= {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Sec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Sec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'section',
       'extra' => {
         'section_number' => '1.1'
       },
@@ -456,8 +485,8 @@ $result_trees{'regenerate_master_menu_with_menu_comment'} = 
{
   ],
   'type' => 'document_root'
 };
-$result_trees{'regenerate_master_menu_with_menu_comment'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'regenerate_master_menu_with_menu_comment'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'regenerate_master_menu_with_menu_comment'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'regenerate_master_menu_with_menu_comment'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'regenerate_master_menu_with_menu_comment'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'regenerate_master_menu_with_menu_comment'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'regenerate_master_menu_with_menu_comment'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'regenerate_master_menu_with_menu_comment'}{'contents'}[2]{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
 $result_texis{'regenerate_master_menu_with_menu_comment'} = '@node Top
 @top top
diff --git a/tp/t/results/value/value_in_index_commands.pl 
b/tp/t/results/value/value_in_index_commands.pl
index d6ec79042c..82db5afabe 100644
--- a/tp/t/results/value/value_in_index_commands.pl
+++ b/tp/t/results/value/value_in_index_commands.pl
@@ -459,23 +459,28 @@ $result_trees{'value_in_index_commands'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -490,24 +495,27 @@ $result_trees{'value_in_index_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'source_marks' => [
             {
@@ -1020,10 +1028,10 @@ $result_trees{'value_in_index_commands'} = {
   ],
   'type' => 'document_root'
 };
-$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'}[3]{'extra'}{'element_node'}
 = $result_trees{'value_in_index_commands'}{'contents'}[2];
-$result_trees{'value_in_index_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'element_node'}
 = $result_trees{'value_in_index_commands'}{'contents'}[2];
+$result_trees{'value_in_index_commands'}{'contents'}[2]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'value_in_index_commands'}{'contents'}[2];
+$result_trees{'value_in_index_commands'}{'contents'}[2]{'contents'}[4]{'extra'}{'element_node'}
 = $result_trees{'value_in_index_commands'}{'contents'}[2];
 
$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'}[7]{'extra'}{'element_node'}
 = $result_trees{'value_in_index_commands'}{'contents'}[2];
 
 $result_texis{'value_in_index_commands'} = '@set cp cp
 @set fn fn
diff --git a/tp/t/results/value/value_in_misc_commands.pl 
b/tp/t/results/value/value_in_misc_commands.pl
index 86fb92b3f6..89a8b30d8e 100644
--- a/tp/t/results/value/value_in_misc_commands.pl
+++ b/tp/t/results/value/value_in_misc_commands.pl
@@ -35,23 +35,28 @@ $result_trees{'value_in_misc_commands'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -66,52 +71,55 @@ $result_trees{'value_in_misc_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'source_marks' => [
+              'contents' => [
                 {
-                  'counter' => 1,
-                  'element' => {
-                    'cmdname' => 'value',
-                    'contents' => [
-                      {
+                  'source_marks' => [
+                    {
+                      'counter' => 1,
+                      'element' => {
+                        'cmdname' => 'value',
                         'contents' => [
                           {
-                            'text' => 'text'
+                            'contents' => [
+                              {
+                                'text' => 'text'
+                              }
+                            ],
+                            'type' => 'brace_container'
                           }
-                        ],
-                        'type' => 'brace_container'
-                      }
-                    ]
-                  },
-                  'line' => 'atext',
-                  'position' => 4,
-                  'sourcemark_type' => 'value_expansion',
-                  'status' => 'start'
-                },
-                {
-                  'counter' => 1,
-                  'position' => 9,
-                  'sourcemark_type' => 'value_expansion',
-                  'status' => 'end'
+                        ]
+                      },
+                      'line' => 'atext',
+                      'position' => 4,
+                      'sourcemark_type' => 'value_expansion',
+                      'status' => 'start'
+                    },
+                    {
+                      'counter' => 1,
+                      'position' => 9,
+                      'sourcemark_type' => 'value_expansion',
+                      'status' => 'end'
+                    }
+                  ],
+                  'text' => 'top atext'
                 }
               ],
-              'text' => 'top atext'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -129,24 +137,27 @@ $result_trees{'value_in_misc_commands'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/value/value_in_node.pl 
b/tp/t/results/value/value_in_node.pl
index d516cae32e..adac0226ac 100644
--- a/tp/t/results/value/value_in_node.pl
+++ b/tp/t/results/value/value_in_node.pl
@@ -35,99 +35,104 @@ $result_trees{'value_in_node'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'Top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '('
-            },
-            {
-              'text' => 'dir'
-            },
-            {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
-            },
-            {
-              'text' => 'dir'
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => 'dir'
+              'contents' => [
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -142,24 +147,27 @@ $result_trees{'value_in_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Expansion in Node Names'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Expansion in Node Names'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -312,74 +320,79 @@ $result_trees{'value_in_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'source_marks' => [
+              'contents' => [
                 {
-                  'counter' => 2,
-                  'position' => 6,
-                  'sourcemark_type' => 'value_expansion',
-                  'status' => 'end'
+                  'source_marks' => [
+                    {
+                      'counter' => 2,
+                      'position' => 6,
+                      'sourcemark_type' => 'value_expansion',
+                      'status' => 'end'
+                    }
+                  ],
+                  'text' => 'Node 1'
                 }
               ],
-              'text' => 'Node 1'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
+              'type' => 'line_arg'
+            },
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
-              'contents' => [
-                {}
-              ]
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Node-1'
@@ -416,24 +429,27 @@ $result_trees{'value_in_node'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter 1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter 1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -605,72 +621,75 @@ $result_trees{'value_in_node'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'Section 1.1'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Node 1'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Section 1.1'
+                }
+              ],
+              'type' => 'line_arg'
+            },
+            {
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Node-1'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Node 1'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
+                {
+                  'text' => 'Node 1'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Node-1'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
-            'normalized' => 'Node-1'
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+            {
+              'contents' => [
+                {
+                  'text' => 'Node 1'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Node-1'
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -753,17 +772,17 @@ $result_trees{'value_in_node'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'value_in_node'}{'contents'}[1]{'args'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = $result_trees{'value_in_node'}{'contents'}[1]{'args'}[1]{'contents'}[1];
-$result_trees{'value_in_node'}{'contents'}[1]{'args'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = $result_trees{'value_in_node'}{'contents'}[1]{'args'}[2]{'contents'}[1];
-$result_trees{'value_in_node'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = $result_trees{'value_in_node'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'value_in_node'}{'contents'}[3]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'value_in_node'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'value_in_node'}{'contents'}[3]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'value_in_node'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-$result_trees{'value_in_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'value_in_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'value_in_node'}{'contents'}[5]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'value_in_node'}{'contents'}[5]{'args'}[2]{'contents'}[0];
-$result_trees{'value_in_node'}{'contents'}[5]{'args'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = $result_trees{'value_in_node'}{'contents'}[5]{'args'}[3]{'contents'}[0];
-$result_trees{'value_in_node'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'value_in_node'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'value_in_node'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'value_in_node'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'value_in_node'}{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'value_in_node'}{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'value_in_node'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'value_in_node'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[1]
 = 
$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'value_in_node'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'value_in_node'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'value_in_node'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'value_in_node'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'value_in_node'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'value_in_node'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'value_in_node'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'value_in_node'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'value_in_node'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'value_in_node'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'value_in_node'}{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'value_in_node'}{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'value_in_node'} = '@set node1 Node 1
 
diff --git a/tp/t/results/value/value_node_directions.pl 
b/tp/t/results/value/value_node_directions.pl
index 2dba058a95..976ebf8264 100644
--- a/tp/t/results/value/value_node_directions.pl
+++ b/tp/t/results/value/value_node_directions.pl
@@ -35,124 +35,129 @@ $result_trees{'value_node_directions'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'Top'
-            }
-          ],
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'source_marks' => [
+              'contents' => [
                 {
-                  'counter' => 1,
-                  'position' => 3,
-                  'sourcemark_type' => 'value_expansion',
-                  'status' => 'end'
+                  'text' => 'Top'
                 }
               ],
-              'text' => 'bar'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
-              'contents' => [
-                {}
-              ]
+              'type' => 'line_arg'
             },
-            'normalized' => 'bar'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'source_marks' => [
+            {
+              'contents' => [
                 {
-                  'counter' => 1,
-                  'element' => {
-                    'cmdname' => 'value',
-                    'contents' => [
-                      {
+                  'source_marks' => [
+                    {
+                      'counter' => 1,
+                      'position' => 3,
+                      'sourcemark_type' => 'value_expansion',
+                      'status' => 'end'
+                    }
+                  ],
+                  'text' => 'bar'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'bar'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'source_marks' => [
+                    {
+                      'counter' => 1,
+                      'element' => {
+                        'cmdname' => 'value',
                         'contents' => [
                           {
-                            'text' => 'a--foo'
+                            'contents' => [
+                              {
+                                'text' => 'a--foo'
+                              }
+                            ],
+                            'type' => 'brace_container'
                           }
-                        ],
-                        'type' => 'brace_container'
-                      }
-                    ]
-                  },
-                  'line' => 'bar',
-                  'position' => 1,
-                  'sourcemark_type' => 'value_expansion',
-                  'status' => 'start'
+                        ]
+                      },
+                      'line' => 'bar',
+                      'position' => 1,
+                      'sourcemark_type' => 'value_expansion',
+                      'status' => 'start'
+                    }
+                  ],
+                  'text' => ' '
                 }
-              ],
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
-            },
-            {
-              'text' => 'dir'
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
-            },
-            {
-              'text' => 'dir'
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -167,52 +172,55 @@ $result_trees{'value_node_directions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'source_marks' => [
+              'contents' => [
                 {
-                  'counter' => 2,
-                  'element' => {
-                    'cmdname' => 'value',
-                    'contents' => [
-                      {
+                  'source_marks' => [
+                    {
+                      'counter' => 2,
+                      'element' => {
+                        'cmdname' => 'value',
                         'contents' => [
                           {
-                            'text' => 'a--foo'
+                            'contents' => [
+                              {
+                                'text' => 'a--foo'
+                              }
+                            ],
+                            'type' => 'brace_container'
                           }
-                        ],
-                        'type' => 'brace_container'
-                      }
-                    ]
-                  },
-                  'line' => 'bar',
-                  'position' => 4,
-                  'sourcemark_type' => 'value_expansion',
-                  'status' => 'start'
-                },
-                {
-                  'counter' => 2,
-                  'position' => 7,
-                  'sourcemark_type' => 'value_expansion',
-                  'status' => 'end'
+                        ]
+                      },
+                      'line' => 'bar',
+                      'position' => 4,
+                      'sourcemark_type' => 'value_expansion',
+                      'status' => 'start'
+                    },
+                    {
+                      'counter' => 2,
+                      'position' => 7,
+                      'sourcemark_type' => 'value_expansion',
+                      'status' => 'end'
+                    }
+                  ],
+                  'text' => 'Var bar'
                 }
               ],
-              'text' => 'Var bar'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'contents' => [
             {
@@ -266,97 +274,102 @@ $result_trees{'value_node_directions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'source_marks' => [
+              'contents' => [
                 {
-                  'counter' => 4,
-                  'position' => 3,
-                  'sourcemark_type' => 'value_expansion',
-                  'status' => 'end'
+                  'source_marks' => [
+                    {
+                      'counter' => 4,
+                      'position' => 3,
+                      'sourcemark_type' => 'value_expansion',
+                      'status' => 'end'
+                    }
+                  ],
+                  'text' => 'bar'
                 }
               ],
-              'text' => 'bar'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => 'BarFoo'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
-              'contents' => [
-                {}
-              ]
+              'type' => 'line_arg'
             },
-            'normalized' => 'BarFoo'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
               'contents' => [
-                {}
-              ]
-            },
-            'normalized' => 'Top'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
+                {
+                  'text' => 'BarFoo'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'BarFoo'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => 'dir'
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'Top'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'bar'
@@ -393,24 +406,27 @@ $result_trees{'value_node_directions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'BarFoo'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'BarFoo'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -430,106 +446,111 @@ $result_trees{'value_node_directions'} = {
       }
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'BarFoo'
-            }
-          ],
-          'type' => 'line_arg'
-        },
-        {
-          'info' => {
-            'spaces_before_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'source_marks' => [
+              'contents' => [
                 {
-                  'counter' => 5,
-                  'position' => 3,
-                  'sourcemark_type' => 'value_expansion',
-                  'status' => 'end'
+                  'text' => 'BarFoo'
                 }
               ],
-              'text' => 'bar'
-            }
-          ],
-          'extra' => {
-            'node_content' => {
-              'contents' => [
-                {}
-              ]
+              'type' => 'line_arg'
             },
-            'normalized' => 'bar'
-          },
-          'info' => {
-            'spaces_before_argument' => {
-              'source_marks' => [
+            {
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
+            },
+            {
+              'contents' => [
                 {
-                  'counter' => 5,
-                  'element' => {
-                    'cmdname' => 'value',
-                    'contents' => [
-                      {
+                  'source_marks' => [
+                    {
+                      'counter' => 5,
+                      'position' => 3,
+                      'sourcemark_type' => 'value_expansion',
+                      'status' => 'end'
+                    }
+                  ],
+                  'text' => 'bar'
+                }
+              ],
+              'extra' => {
+                'node_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                },
+                'normalized' => 'bar'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'source_marks' => [
+                    {
+                      'counter' => 5,
+                      'element' => {
+                        'cmdname' => 'value',
                         'contents' => [
                           {
-                            'text' => 'a--foo'
+                            'contents' => [
+                              {
+                                'text' => 'a--foo'
+                              }
+                            ],
+                            'type' => 'brace_container'
                           }
-                        ],
-                        'type' => 'brace_container'
-                      }
-                    ]
-                  },
-                  'line' => 'bar',
-                  'position' => 1,
-                  'sourcemark_type' => 'value_expansion',
-                  'status' => 'start'
+                        ]
+                      },
+                      'line' => 'bar',
+                      'position' => 1,
+                      'sourcemark_type' => 'value_expansion',
+                      'status' => 'start'
+                    }
+                  ],
+                  'text' => ' '
                 }
-              ],
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
-            },
-            {
-              'text' => 'dir'
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'dir'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'BarFoo'
@@ -544,23 +565,28 @@ $result_trees{'value_node_directions'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'bar'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'bar'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'chapter',
       'extra' => {
         'section_number' => '2'
       },
@@ -576,14 +602,14 @@ $result_trees{'value_node_directions'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'value_node_directions'}{'contents'}[1]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'value_node_directions'}{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'value_node_directions'}{'contents'}[1]{'args'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'value_node_directions'}{'contents'}[1]{'args'}[2]{'contents'}[1];
-$result_trees{'value_node_directions'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'value_node_directions'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'value_node_directions'}{'contents'}[3]{'args'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'value_node_directions'}{'contents'}[3]{'args'}[1]{'contents'}[0];
-$result_trees{'value_node_directions'}{'contents'}[3]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'value_node_directions'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'value_node_directions'}{'contents'}[3]{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'value_node_directions'}{'contents'}[3]{'args'}[3]{'contents'}[1];
-$result_trees{'value_node_directions'}{'contents'}[5]{'args'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'value_node_directions'}{'contents'}[5]{'args'}[2]{'contents'}[0];
-$result_trees{'value_node_directions'}{'contents'}[5]{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'value_node_directions'}{'contents'}[5]{'args'}[3]{'contents'}[1];
+$result_trees{'value_node_directions'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'value_node_directions'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'value_node_directions'}{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'value_node_directions'}{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'value_node_directions'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'value_node_directions'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'value_node_directions'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'value_node_directions'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'value_node_directions'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'value_node_directions'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'value_node_directions'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'value_node_directions'}{'contents'}[3]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'value_node_directions'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'value_node_directions'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'value_node_directions'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'value_node_directions'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
 $result_texis{'value_node_directions'} = '@set a--foo bar
 
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl 
b/tp/t/results/xml_tests/commands_and_spaces.pl
index bbfcc0246c..075929e00a 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -110,100 +110,103 @@ $result_trees{'commands_and_spaces'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'text' => 'a'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => '('
-            },
-            {
-              'text' => 'b'
-            },
-            {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
-            },
-            {
-              'text' => 'c'
+                {
+                  'text' => 'a'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => ' '
-            }
-          },
-          'type' => 'line_arg'
-        },
-        {
-          'contents' => [
-            {
-              'text' => '('
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'b'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => 'd'
+              'contents' => [
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'c'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             },
             {
-              'text' => ')'
-            }
-          ],
-          'extra' => {
-            'manual_content' => {
               'contents' => [
-                {}
-              ]
-            }
-          },
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '   
+                {
+                  'text' => '('
+                },
+                {
+                  'text' => 'd'
+                },
+                {
+                  'text' => ')'
+                }
+              ],
+              'extra' => {
+                'manual_content' => {
+                  'contents' => [
+                    {}
+                  ]
+                }
+              },
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '   
 '
-            },
-            'spaces_before_argument' => {
-              'text' => ' '
+                },
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'node',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1654,16 +1657,16 @@ $result_trees{'commands_and_spaces'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[1]{'contents'}[1];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[2]{'contents'}[1];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'contents'}[2]{'extra'}{'float'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'contents'}[4]{'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'}[2];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'extra'}{'shortcaption'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'contents'}[4];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'extra'}{'columnfractions'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[35]{'extra'}{'command_as_argument'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$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'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[24]{'contents'}[2]{'extra'}{'float'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[24];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[24]{'contents'}[4]{'extra'}{'float'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[24];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[24]{'extra'}{'caption'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[24]{'contents'}[2];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[24]{'extra'}{'shortcaption'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[24]{'contents'}[4];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[26]{'extra'}{'columnfractions'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'extra'}{'command_as_argument'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1];
 
 $result_texis{'commands_and_spaces'} = '@set  foo   some @value
 
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 baaeb6f753..a6ccb75d05 100644
--- a/tp/t/results/xml_tests/image_inline_or_not.pl
+++ b/tp/t/results/xml_tests/image_inline_or_not.pl
@@ -77,23 +77,28 @@ $result_trees{'image_inline_or_not'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -108,24 +113,27 @@ $result_trees{'image_inline_or_not'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -938,39 +946,44 @@ $result_trees{'image_inline_or_not'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'image',
               'contents' => [
                 {
+                  'cmdname' => 'image',
                   'contents' => [
                     {
-                      'text' => 'node_image'
+                      'contents' => [
+                        {
+                          'text' => 'node_image'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'extra' => {
+                    'input_encoding_name' => 'utf-8'
+                  },
+                  'source_info' => {
+                    'line_nr' => 41
+                  }
                 }
               ],
-              'extra' => {
-                'input_encoding_name' => 'utf-8'
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
               },
-              'source_info' => {
-                'line_nr' => 41
-              }
+              'type' => 'line_arg'
             }
           ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'node_005fimage'
@@ -985,40 +998,43 @@ $result_trees{'image_inline_or_not'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'cmdname' => 'image',
               'contents' => [
                 {
+                  'cmdname' => 'image',
                   'contents' => [
                     {
-                      'text' => 'in_chapter_arg'
+                      'contents' => [
+                        {
+                          'text' => 'in_chapter_arg'
+                        }
+                      ],
+                      'type' => 'brace_arg'
                     }
                   ],
-                  'type' => 'brace_arg'
+                  'extra' => {
+                    'input_encoding_name' => 'utf-8'
+                  },
+                  'source_info' => {
+                    'line_nr' => 42
+                  }
                 }
               ],
-              'extra' => {
-                'input_encoding_name' => 'utf-8'
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
               },
-              'source_info' => {
-                'line_nr' => 42
-              }
+              'type' => 'line_arg'
             }
           ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
-'
-            }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1356,13 +1372,13 @@ $result_trees{'image_inline_or_not'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'contents'}[3]{'contents'}[1];
-$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[2]{'contents'}[3]{'contents'}[3];
-$result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[6]{'contents'}[5]{'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'}[5];
-$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'}[2]{'contents'}[11]{'extra'}{'command_as_argument'}
 = 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
 = 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'contents'}[3]{'contents'}[1];
+$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
 = 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[13]{'contents'}[2]{'contents'}[3]{'contents'}[3];
+$result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'extra'}{'float'}
 = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[7];
+$result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[7]{'extra'}{'caption'}
 = 
$result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[7]{'contents'}[5];
+$result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[7]{'extra'}{'float_section'}
 = $result_trees{'image_inline_or_not'}{'contents'}[4];
 
 $result_texis{'image_inline_or_not'} = '@image{A}
 
diff --git a/tp/t/results/xml_tests/sectioning_test_no_use_nodes.pl 
b/tp/t/results/xml_tests/sectioning_test_no_use_nodes.pl
index fe193106c4..503b53d8fc 100644
--- a/tp/t/results/xml_tests/sectioning_test_no_use_nodes.pl
+++ b/tp/t/results/xml_tests/sectioning_test_no_use_nodes.pl
@@ -11,23 +11,28 @@ $result_trees{'sectioning_test_no_use_nodes'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'sectioning_test_no_use_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -91,23 +99,28 @@ $result_trees{'sectioning_test_no_use_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -122,24 +135,27 @@ $result_trees{'sectioning_test_no_use_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -173,23 +189,28 @@ $result_trees{'sectioning_test_no_use_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sec'
@@ -204,24 +225,27 @@ $result_trees{'sectioning_test_no_use_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -255,23 +279,28 @@ $result_trees{'sectioning_test_no_use_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap2'
@@ -286,24 +315,27 @@ $result_trees{'sectioning_test_no_use_nodes'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
diff --git a/tp/t/results/xml_tests/sectioning_test_ref.pl 
b/tp/t/results/xml_tests/sectioning_test_ref.pl
index 580f0a324b..1575b18b07 100644
--- a/tp/t/results/xml_tests/sectioning_test_ref.pl
+++ b/tp/t/results/xml_tests/sectioning_test_ref.pl
@@ -11,23 +11,28 @@ $result_trees{'sectioning_test_ref'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'sectioning_test_ref'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -91,23 +99,28 @@ $result_trees{'sectioning_test_ref'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -122,24 +135,27 @@ $result_trees{'sectioning_test_ref'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -173,23 +189,28 @@ $result_trees{'sectioning_test_ref'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'sec'
@@ -204,24 +225,27 @@ $result_trees{'sectioning_test_ref'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'section',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'sec1'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'sec1'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'section',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -255,23 +279,28 @@ $result_trees{'sectioning_test_ref'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap2'
@@ -286,24 +315,27 @@ $result_trees{'sectioning_test_ref'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chap2'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chap2'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
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 bfdbd45998..654df32d41 100644
--- a/tp/t/results/xml_tests/top_node_and_bye.pl
+++ b/tp/t/results/xml_tests/top_node_and_bye.pl
@@ -12,24 +12,27 @@ $result_trees{'top_node_and_bye'} = [
         'type' => 'before_node_section'
       },
       {
-        'args' => [
+        'cmdname' => 'node',
+        'contents' => [
           {
             'contents' => [
               {
-                'text' => 'Top'
-              }
-            ],
-            'info' => {
-              'spaces_after_argument' => {
-                'text' => '
+                'contents' => [
+                  {
+                    'text' => 'Top'
+                  }
+                ],
+                'info' => {
+                  'spaces_after_argument' => {
+                    'text' => '
 '
+                  }
+                },
+                'type' => 'line_arg'
               }
-            },
-            'type' => 'line_arg'
-          }
-        ],
-        'cmdname' => 'node',
-        'contents' => [
+            ],
+            'type' => 'argument'
+          },
           {
             'text' => '
 ',
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 25261a3e30..175e3b5ce2 100644
--- a/tp/t/results/xml_tests/top_node_no_section.pl
+++ b/tp/t/results/xml_tests/top_node_no_section.pl
@@ -11,23 +11,28 @@ $result_trees{'top_node_no_section'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
diff --git a/tp/t/results/xtable/block_commands_in_table.pl 
b/tp/t/results/xtable/block_commands_in_table.pl
index 2967e43e79..5ad809e4ce 100644
--- a/tp/t/results/xtable/block_commands_in_table.pl
+++ b/tp/t/results/xtable/block_commands_in_table.pl
@@ -11,23 +11,28 @@ $result_trees{'block_commands_in_table'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -42,24 +47,27 @@ $result_trees{'block_commands_in_table'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Element'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Element'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -77,23 +85,28 @@ $result_trees{'block_commands_in_table'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -108,24 +121,27 @@ $result_trees{'block_commands_in_table'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1281,15 +1297,15 @@ $result_trees{'block_commands_in_table'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'block_commands_in_table'}{'contents'}[3];
-$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'block_commands_in_table'}{'contents'}[3];
-$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'block_commands_in_table'}{'contents'}[3];
-$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'block_commands_in_table'}{'contents'}[3];
 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'block_commands_in_table'}{'contents'}[3];
+$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'block_commands_in_table'}{'contents'}[3];
 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[7]{'extra'}{'command_as_argument'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'block_commands_in_table'}{'contents'}[3];
+$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'block_commands_in_table'}{'contents'}[3];
+$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[8]{'extra'}{'command_as_argument'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'block_commands_in_table'} = '@node Top
 @top Element
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 d15e43aebe..c26270d46a 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table.pl
@@ -16,23 +16,28 @@ $result_trees{'inter_item_commands_in_table'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'Top'
@@ -47,24 +52,27 @@ $result_trees{'inter_item_commands_in_table'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'top',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'top'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'top'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'top',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -82,23 +90,28 @@ $result_trees{'inter_item_commands_in_table'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chapter'
@@ -113,24 +126,27 @@ $result_trees{'inter_item_commands_in_table'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -2394,39 +2410,39 @@ $result_trees{'inter_item_commands_in_table'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'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]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'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'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[6]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[8]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[12]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[12]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[14]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[14]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[16]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[16]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[16]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[18]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[18]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[20]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[20]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[22]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[22]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[24]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[24]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[24]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[24]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'inter_item_commands_in_table'} = '@node Top
 @top top
diff --git a/tp/t/results/xtable/item_index_transformation.pl 
b/tp/t/results/xtable/item_index_transformation.pl
index 4355cebedd..ebd5f1f225 100644
--- a/tp/t/results/xtable/item_index_transformation.pl
+++ b/tp/t/results/xtable/item_index_transformation.pl
@@ -11,23 +11,28 @@ $result_trees{'item_index_transformation'} = {
       'type' => 'before_node_section'
     },
     {
-      'args' => [
+      'cmdname' => 'node',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'chap'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'chap'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
+          ],
+          'type' => 'argument'
         }
       ],
-      'cmdname' => 'node',
       'extra' => {
         'is_target' => 1,
         'normalized' => 'chap'
@@ -42,24 +47,27 @@ $result_trees{'item_index_transformation'} = {
       }
     },
     {
-      'args' => [
+      'cmdname' => 'chapter',
+      'contents' => [
         {
           'contents' => [
             {
-              'text' => 'Chapter'
-            }
-          ],
-          'info' => {
-            'spaces_after_argument' => {
-              'text' => '
+              'contents' => [
+                {
+                  'text' => 'Chapter'
+                }
+              ],
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
 '
+                }
+              },
+              'type' => 'line_arg'
             }
-          },
-          'type' => 'line_arg'
-        }
-      ],
-      'cmdname' => 'chapter',
-      'contents' => [
+          ],
+          'type' => 'argument'
+        },
         {
           'text' => '
 ',
@@ -1286,19 +1294,19 @@ $result_trees{'item_index_transformation'} = {
   ],
   'type' => 'document_root'
 };
-$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'item_index_transformation'}{'contents'}[1];
-$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'item_index_transformation'}{'contents'}[1];
-$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'item_index_transformation'}{'contents'}[1];
-$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'item_index_transformation'}{'contents'}[1];
-$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'item_index_transformation'}{'contents'}[1];
-$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'item_index_transformation'}{'contents'}[1];
-$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'item_index_transformation'}{'contents'}[1];
-$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'item_index_transformation'}{'contents'}[1];
-$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'item_index_transformation'}{'contents'}[1];
-$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[7]{'extra'}{'command_as_argument'}
 = 
$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'item_index_transformation'}{'contents'}[1];
+$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'item_index_transformation'}{'contents'}[1];
+$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
 = $result_trees{'item_index_transformation'}{'contents'}[1];
+$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'item_index_transformation'}{'contents'}[1];
+$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'item_index_transformation'}{'contents'}[1];
+$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'item_index_transformation'}{'contents'}[1];
+$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'item_index_transformation'}{'contents'}[1];
+$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[6]{'extra'}{'command_as_argument'}
 = 
$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
 = $result_trees{'item_index_transformation'}{'contents'}[1];
+$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
 = $result_trees{'item_index_transformation'}{'contents'}[1];
+$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[8]{'extra'}{'command_as_argument'}
 = 
$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
 $result_texis{'item_index_transformation'} = '@node chap
 @chapter Chapter



reply via email to

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